Merge pull request #2 from UseMuffin/cake-update

Update to Cake 3.4.
UseMuffin · Apr 15, 2018 · 99bbecd · 99bbecd
2 parents 7c51395 + 0576c9b
commit 99bbecd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 sudo: false
 
@@ -43,7 +43,7 @@ script:
 
   - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.8 && vendor/bin/phpstan analyse -l 5 src; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.9 && vendor/bin/phpstan analyse -l 5 src; fi
 
 after_success:
   - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then bash <(curl -s https://codecov.io/bash); fi

diff --git a/composer.json b/composer.json
@@ -30,11 +30,11 @@
         "source": "https://github.com/usemuffin/orderly"
     },
     "require": {
-        "cakephp/orm": "^3.0"
+        "cakephp/orm": "3.4.*"
     },
     "require-dev": {
-        "cakephp/cakephp": "^3.0",
-        "phpunit/phpunit": "<6.0"
+        "cakephp/cakephp": "3.4.*",
+        "phpunit/phpunit": "^5.7.14|^6.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Model/Behavior/OrderlyBehavior.php b/src/Model/Behavior/OrderlyBehavior.php
@@ -62,8 +62,8 @@ protected function _normalizeConfig($orders)
         }
 
         $default = [
-            'order' => $this->_table->aliasField($this->_table->displayField()),
-            'callback' => null
+            'order' => $this->_table->aliasField($this->_table->getDisplayField()),
+            'callback' => null,
         ];
 
         foreach ($orders as $key => $value) {

diff --git a/tests/TestCase/Model/Behavior/OrderlyBehaviorTest.php b/tests/TestCase/Model/Behavior/OrderlyBehaviorTest.php
@@ -33,13 +33,13 @@ public function testInitialize()
 
         $expected = [
             [
-                'order' => $this->Table->aliasField($this->Table->displayField()),
+                'order' => $this->Table->aliasField($this->Table->getDisplayField()),
                 'callback' => null
             ]
         ];
         $this->assertEquals(
             $expected,
-            $this->Table->behaviors()->Orderly->config()['orders']
+            $this->Table->behaviors()->Orderly->getConfig()['orders']
         );
 
         $this->Table->removeBehavior('Orderly');
@@ -53,7 +53,7 @@ public function testInitialize()
         ];
         $this->assertEquals(
             $expected,
-            $this->Table->behaviors()->Orderly->config()['orders']
+            $this->Table->behaviors()->Orderly->getConfig()['orders']
         );
 
         $callback = function () {
@@ -70,7 +70,7 @@ public function testInitialize()
         ];
         $this->assertEquals(
             $expected,
-            $this->Table->behaviors()->Orderly->config()['orders']
+            $this->Table->behaviors()->Orderly->getConfig()['orders']
         );
 
         $this->Table->removeBehavior('Orderly');
@@ -91,7 +91,7 @@ public function testInitialize()
         ];
         $this->assertEquals(
             $expected,
-            $this->Table->behaviors()->Orderly->config()['orders']
+            $this->Table->behaviors()->Orderly->getConfig()['orders']
         );
     }