Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
gav- committed Sep 28, 2022
2 parents 2df1a1d + 8755364 commit c82035f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
### 6.0.2 (Released 2022-09-28) ###
- Fix regression that stops non Data API backends from working.

### 6.0.1 (Released 2022-09-14) ###
- Fix Data API Create Record - include script results
- Fix Data API Create Record - include script results.

### 6.0.0 (Released 2022-08-01) ###
- Added FileMaker Data API support. This is now the default backend for new
Expand Down
4 changes: 2 additions & 2 deletions RESTfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
$startTimeUs = microtime(TRUE);

// Ensure E_STRICT is removed for PHP 5.4+
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
//error_reporting(E_ALL & ~E_STRICT); // Dev. level reporting
//error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
error_reporting(E_ALL & ~E_STRICT); // Dev. level reporting

// x-debug's html error output makes CLI debugging with cURL a problem.
ini_set('html_errors', FALSE);
Expand Down
10 changes: 9 additions & 1 deletion lib/RESTfm/BackendAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,15 @@ abstract public function makeOpsRecord ($database, $layout);
* @param string $layout
*
* @return OpsFieldAbstract
*
* @throws ResponseException
* When this method is not implemented/overridden in a backend.
*/
abstract public function makeOpsField ($database, $layout);
public function makeOpsField ($database, $layout) {
throw new ResponseException(
'Field level operations not implemented by this RESTfm backend',
Response::METHODNOTALLOWED
);
}

}
2 changes: 1 addition & 1 deletion lib/RESTfm/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Version static class to hold release version.
*/
class Version {
private static $_release = '6.0.1';
private static $_release = 'dev';
private static $_revision = '%%REVISION%%';
private static $_protocol = '6'; // Bump this when REST API changes.

Expand Down

0 comments on commit c82035f

Please sign in to comment.