Merge pull request #7 from infoseci/cake-deprecations

Fix various deprecations for newer versions of Cake.

Author: robertpustulka

.travis.yml

@@ -5,11 +5,10 @@ dist: trusty
 sudo: false
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
-  
+
 env:
   global:
     - DEFAULT=1
@@ -20,11 +19,9 @@ matrix:
   include:
     - php: 5.6
       env: PHPCS=1 DEFAULT=0
-    - php: 7.1
-      env: PHPSTAN=4 DEFAULT=0
     - php: 7.1
       env: PHPSTAN=5 DEFAULT=0
-      
+
   allow_failures:
     - env: PHPSTAN=5 DEFAULT=0
 

composer.json

@@ -5,13 +5,13 @@
     "type": "cakephp-plugin",
     "license": "MIT",
     "require": {
-        "php": ">=5.5.9",
-        "cakephp/orm": "~3.2"
+        "php": ">=5.6",
+        "cakephp/orm": "~3.5"
     },
     "require-dev": {
-        "php": ">=5.5",
+        "php": ">=5.6",
         "phpunit/phpunit": "<6.0",
-        "cakephp/cakephp": "~3.2.0",
+        "cakephp/cakephp": "~3.5",
         "cakephp/cakephp-codesniffer": "@stable"
     },
     "autoload": {

src/Model/Behavior/MatchesTrait.php

@@ -13,7 +13,7 @@ trait MatchesTrait
     /**
      * Checks rules match.
      *
-     * @param type $subject Subject
+     * @param string $subject Subject
      * @param array $rules Rules list
      * @return bool
      */

src/Model/Behavior/StiBehavior.php

@@ -54,7 +54,7 @@ class StiBehavior extends Behavior
     public function initialize(array $config)
     {
         if ($this->_config['table'] !== null) {
-            $this->_table->table($this->_config['table']);
+            $this->_table->setTable($this->_config['table']);
         }
         if ($this->_config['discriminator'] !== null) {
             $this->setDiscriminator($this->_config['discriminator']);
@@ -86,7 +86,7 @@ public function discriminator($discriminator = null)
     public function getDiscriminator()
     {
         if ($this->_discriminator === null) {
-            $this->_discriminator = $this->_table->alias();
+            $this->_discriminator = $this->_table->getAlias();
         }
 
         return $this->_discriminator;
@@ -223,7 +223,7 @@ public function checkRules(EntityInterface $entity)
     {
         $field = $this->_config['discriminatorField'];
 
-        if ($entity->dirty($field)) {
+        if ($entity->isDirty($field)) {
             return $this->_matches($entity->get($field), $this->acceptedDiscriminators());
         }
 

src/Model/Behavior/StiParentBehavior.php

@@ -92,7 +92,7 @@ public function addStiTable($discriminator, $table)
                 $alias = $table;
             }
 
-            $table = $this->tableLocator()->get($alias, $options);
+            $table = $this->getTableLocator()->get($alias, $options);
         }
 
         $this->_childTables[$discriminator] = $table;
@@ -124,20 +124,20 @@ public function newStiEntity($data = null, array $options = [])
      */
     public function beforeFind(Event $event, Query $query, ArrayAccess $options)
     {
-        if (!$query->hydrate()) {
+        if (!$query->isHydrationEnabled()) {
             return;
         }
         $query->formatResults(function ($results) {
             return $results->map(function ($row) {
                 if ($row instanceof CopyableEntityInterface) {
                     $table = $this->stiTable($row);
-                    $entityClass = $table->entityClass();
+                    $entityClass = $table->getEntityClass();
 
                     $row = new $entityClass($row->copyProperties(), [
                         'markNew' => $row->isNew(),
                         'markClean' => true,
                         'guard' => false,
-                        'source' => $table->registryAlias()
+                        'source' => $table->getRegistryAlias()
                     ]);
                 }
 

src/Plugin.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Robotusers\TableInheritance;
+
+use Cake\Core\BasePlugin;
+
+class Plugin extends BasePlugin
+{
+}

tests/TestCase/Model/Behavior/StiBehaviorTest.php

@@ -13,7 +13,7 @@
 class StiBehaviorTest extends TestCase
 {
     public $fixtures = [
-        'plugin.Robotusers\TableInheritance.users'
+        'plugin.Robotusers\TableInheritance.Users'
     ];
 
     public function tearDown()
@@ -74,7 +74,7 @@ public function testSave()
         ]);
         $table->save($entity);
 
-        $this->assertEmpty($entity->errors());
+        $this->assertEmpty($entity->getErrors());
         $this->assertEquals('Authors', $entity->discriminator);
 
         $entity2 = $table->newEntity([
@@ -83,7 +83,7 @@ public function testSave()
         ]);
         $table->save($entity2);
 
-        $this->assertArrayHasKey('discriminator', $entity2->errors());
+        $this->assertArrayHasKey('discriminator', $entity2->getErrors());
         $this->assertEquals('Editors', $entity2->discriminator);
     }
 
@@ -102,7 +102,7 @@ public function testSaveNoRules()
         ]);
         $table->save($entity);
 
-        $this->assertEmpty($entity->errors());
+        $this->assertEmpty($entity->getErrors());
         $this->assertEquals('Editors', $entity->discriminator);
     }
 
@@ -121,7 +121,7 @@ public function testSaveWildcard()
         ]);
         $table->save($entity);
 
-        $this->assertEmpty($entity->errors());
+        $this->assertEmpty($entity->getErrors());
         $this->assertEquals('author_foo', $entity->discriminator);
     }
 

tests/TestCase/Model/Behavior/StiParentBehaviorTest.php

@@ -17,7 +17,7 @@
 class StiParentBehaviorTest extends TestCase
 {
     public $fixtures = [
-        'plugin.Robotusers\TableInheritance.users'
+        'plugin.Robotusers\TableInheritance.Users'
     ];
 
     /**
@@ -39,16 +39,16 @@ public function setUp()
             '' => User::class
         ];
 
-        $this->table = TableRegistry::get('Users');
-        $this->table->entityClass(User::class);
+        $this->table = TableRegistry::getTableLocator()->get('Users');
+        $this->table->setEntityClass(User::class);
 
-        $authors = TableRegistry::get('Authors', [
+        $authors = TableRegistry::getTableLocator()->get('Authors', [
             'table' => 'users'
         ]);
-        $editors = TableRegistry::get('Editors', [
+        $editors = TableRegistry::getTableLocator()->get('Editors', [
             'table' => 'users'
         ]);
-        $readers = TableRegistry::get('Readers', [
+        $readers = TableRegistry::getTableLocator()->get('Readers', [
             'table' => 'users'
         ]);
 
@@ -68,18 +68,18 @@ public function setUp()
             ]
         ]);
 
-        $authors->entityClass(Author::class);
-        $editors->entityClass(Editor::class);
-        $readers->entityClass(Reader::class);
+        $authors->setEntityClass(Author::class);
+        $editors->setEntityClass(Editor::class);
+        $readers->setEntityClass(Reader::class);
     }
 
     public function testStiTable()
     {
-        $this->table->behaviors()->get('StiParent')->config('tableMap', [
+        $this->table->behaviors()->get('StiParent')->setConfig('tableMap', [
             'Readers' => 'reader_*'
         ], false);
-        $this->table->behaviors()->get('StiParent')->config('discriminatorMap', [
-            '*author' => TableRegistry::get('Authors')
+        $this->table->behaviors()->get('StiParent')->setConfig('discriminatorMap', [
+            '*author' => TableRegistry::getTableLocator()->get('Authors')
         ], false);
 
         $map = [
@@ -96,7 +96,7 @@ public function testStiTable()
                 'discriminator' => $discriminator
             ]);
             $table = $this->table->stiTable($entity);
-            $this->assertEquals($alias, $table->alias());
+            $this->assertEquals($alias, $table->getAlias());
         }
     }
 

tests/bootstrap.php

@@ -27,4 +27,4 @@
 
 require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
 
-\Cake\Core\Plugin::load('Robotusers/TableInheritance', ['path' => dirname(dirname(__FILE__)) . DS]);
+\Cake\Core\Plugin::getCollection()->add(new \Robotusers\TableInheritance\Plugin());