Merge pull request #549 from FriendsOfCake/php-72

Rename "Object" to "BaseObject" for PHP 7.2 compatibility.

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 sudo: false
 
@@ -27,7 +28,7 @@ matrix:
       env: PHPSTAN=1 DEFAULT=0
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION != 7.0 && $TRAVIS_PHP_VERSION != 7.2 ]]; then phpenv config-rm xdebug.ini; fi
 
   - if [[ $TRAVIS_PHP_VERSION = 5.5 ]]; then composer require --dev friendsofcake/search:^3.0; fi
   - if [[ $TRAVIS_PHP_VERSION != 5.5 ]]; then composer install --prefer-dist --no-interaction; fi

src/Action/BaseAction.php

@@ -6,7 +6,7 @@
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 use Cake\Utility\Text;
-use Crud\Core\Object;
+use Crud\Core\BaseObject;
 use Crud\Event\Subject;
 
 /**
@@ -15,7 +15,7 @@
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  */
-abstract class BaseAction extends Object
+abstract class BaseAction extends BaseObject
 {
 
     /**

src/Core/BaseObject.php

@@ -0,0 +1,69 @@
+<?php
+namespace Crud\Core;
+
+use Cake\Controller\Controller;
+use Cake\Core\InstanceConfigTrait;
+use Cake\Event\EventListenerInterface;
+
+/**
+ * Crud Base Class
+ *
+ * Implement base methods used in CrudAction and CrudListener classes
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ */
+abstract class BaseObject implements EventListenerInterface
+{
+
+    use InstanceConfigTrait;
+    use ProxyTrait;
+
+    /**
+     * Container with reference to all objects
+     * needed within the CrudListener and CrudAction
+     *
+     * @var \Cake\Controller\Controller
+     */
+    protected $_controller;
+
+    /**
+     * Default configuration
+     *
+     * @var array
+     */
+    protected $_defaultConfig = [];
+
+    /**
+     * Constructor
+     *
+     * @param \Cake\Controller\Controller $Controller Controller instance
+     * @param array $config Default settings
+     */
+    public function __construct(Controller $Controller, $config = [])
+    {
+        $this->_controller = $Controller;
+        $this->config($config);
+    }
+
+    /**
+     * List of implemented events
+     *
+     * @return array
+     */
+    public function implementedEvents()
+    {
+        return [];
+    }
+
+    /**
+     * Convenient method for Request::is
+     *
+     * @param string|array $method Method(s) to check for
+     * @return bool
+     */
+    protected function _checkRequestType($method)
+    {
+        return $this->_request()->is($method);
+    }
+}

src/Core/Object.php

@@ -1,69 +1,5 @@
 <?php
-namespace Crud\Core;
-
-use Cake\Controller\Controller;
-use Cake\Core\InstanceConfigTrait;
-use Cake\Event\EventListenerInterface;
-
-/**
- * Crud Base Class
- *
- * Implement base methods used in CrudAction and CrudListener classes
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- */
-abstract class Object implements EventListenerInterface
-{
-
-    use InstanceConfigTrait;
-    use ProxyTrait;
-
-    /**
-     * Container with reference to all objects
-     * needed within the CrudListener and CrudAction
-     *
-     * @var \Cake\Controller\Controller
-     */
-    protected $_controller;
-
-    /**
-     * Default configuration
-     *
-     * @var array
-     */
-    protected $_defaultConfig = [];
-
-    /**
-     * Constructor
-     *
-     * @param \Cake\Controller\Controller $Controller Controller instance
-     * @param array $config Default settings
-     */
-    public function __construct(Controller $Controller, $config = [])
-    {
-        $this->_controller = $Controller;
-        $this->config($config);
-    }
-
-    /**
-     * List of implemented events
-     *
-     * @return array
-     */
-    public function implementedEvents()
-    {
-        return [];
-    }
-
-    /**
-     * Convenient method for Request::is
-     *
-     * @param string|array $method Method(s) to check for
-     * @return bool
-     */
-    protected function _checkRequestType($method)
-    {
-        return $this->_request()->is($method);
-    }
+// @deprecated Add backwards compat alias. "Object" is protected keyword in PHP 7.2
+if (PHP_VERSION_ID < 70200) {
+    class_alias('Crud\Core\BaseObject', 'Crud\Core\Object');
 }

src/Listener/BaseListener.php

@@ -1,7 +1,7 @@
 <?php
 namespace Crud\Listener;
 
-use Crud\Core\Object;
+use Crud\Core\BaseObject;
 
 /**
  * The Base Crud Listener
@@ -11,7 +11,7 @@
  *
  * @codeCoverageIgnore
  */
-abstract class BaseListener extends Object
+abstract class BaseListener extends BaseObject
 {
 
     /**