Merge pull request #15 from josegonzalez/patch-1

fix: remove deprecated code usage

Author: ADmad

.travis.yml

@@ -23,16 +23,19 @@ matrix:
 
     - php: 7.0
       env: PHPSTAN=1 DEFAULT=0
+      
+    - php: 5.6
+      env: PREFER_LOWEST=1
 
-before_install:
+before_script:
   - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
 
+  - if [[ $PREFER_LOWEST != 1 ]]; then composer update --no-interaction; fi
+  - if [[ $PREFER_LOWEST == 1 ]]; then composer update --no-interaction --prefer-lowest --prefer-stable; fi
+
   - if [[ $DB = 'mysql' ]]; then mysql -u root -e 'CREATE DATABASE cakephp_test;'; fi
   - if [[ $DB = 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
 
-before_script:
-  - composer install --prefer-dist --no-interaction
-
   - if [[ $PHPSTAN = 1 ]]; then composer require phpstan/phpstan:^0.9; fi
 
 script:

composer.json

@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^3.0",
-        "phpunit/phpunit": "@stable",
+        "phpunit/phpunit": "^5.7.14|^6.0",
         "cakephp/migrations": "^1.0"
     },
     "autoload": {

src/Model/Behavior/TokenizeBehavior.php

@@ -37,8 +37,8 @@ public function initialize(array $config)
             'className' => 'Muffin/Tokenize.Tokens',
             'foreignKey' => 'foreign_key',
             'conditions' => [
-                'foreign_alias' => $this->_table->alias(),
-                'foreign_table' => $this->_table->table(),
+                'foreign_alias' => $this->_table->getAlias(),
+                'foreign_table' => $this->_table->getTable(),
             ],
             'dependent' => true,
         ]);

tests/TestCase/Controller/TokensControllerTest.php

@@ -14,11 +14,7 @@ class TokensControllerTest extends TestCase
     public function testVerify()
     {
         $request = new ServerRequest();
-        $request->addParams([
-            'token' => 'foo',
-        ]);
-
-        $controller = new TokensController($request, new Response());
+        $controller = new TokensController($request->withParam('token', 'foo'), new Response());
         $controller->Tokens = $this->getMockForModel('Muffin/Tokenize.Tokens', ['verify']);
         $controller->Tokens->expects($this->once())
             ->method('verify')

tests/TestCase/Model/Behavior/TokenizeBehaviorTest.php

@@ -93,7 +93,7 @@ public function testBeforeSaveWithExistingEntity()
                 'alias' => 'Users',
             ]])
             ->getMock();
-        $table->primaryKey('id');
+        $table->setPrimaryKey('id');
         $table->expects($this->once())
             ->method('dispatchEvent')
             ->with('Model.afterTokenize', compact('entity', 'token'));
@@ -129,7 +129,7 @@ public function testAfterSave()
                 'alias' => 'Users',
             ]])
             ->getMock();
-        $table->primaryKey('id');
+        $table->setPrimaryKey('id');
         $table->expects($this->once())
             ->method('dispatchEvent')
             ->with('Model.afterTokenize', compact('entity', 'token'));
@@ -170,7 +170,7 @@ public function testTokenize()
                 'alias' => 'Users',
             ]])
             ->getMock();
-        $table->primaryKey('id');
+        $table->setPrimaryKey('id');
 
         $table->Tokens = $this->getMockBuilder('Muffin\Tokenize\Model\Table\TokensTable')
             ->setMethods(['newEntity', 'save'])