Merge pull request #3 from styks1987/master

remove 5.4, upgrade to cakephp 3.6, upgrade phpunit to 5
bcrowe · May 17, 2018 · c820cd6 · c820cd6
2 parents 63857c1 + b0df963
commit c820cd6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,6 @@ env:
     - RUN_TESTS=1
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - hhvm
@@ -16,8 +14,6 @@ sudo: false
 
 matrix:
   include:
-    - php: 5.4
-      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
     - php: 5.6
       env: PHPCS=1 RUN_TESTS=0
 
@@ -26,7 +22,7 @@ before_script:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:
-  - sh -c "if [ '$RUN_TESTS' = '1' ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi"
+  - sh -c "if [ '$RUN_TESTS' = '1' ]; then vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover; fi"
   - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p -n --extensions=php --standard=psr2 ./src ./tests; fi"
 
 after_script:

diff --git a/composer.json b/composer.json
@@ -16,12 +16,12 @@
         }
     ],
     "require": {
-        "php": ">=5.4.16",
-        "cakephp/cakephp": "~3.0"
+        "php": ">=5.6",
+        "cakephp/cakephp": "~3.6"
     },
     "require-dev": {
-        "phpunit/phpunit" : "~4.0",
-        "scrutinizer/ocular": "~1.1",
+        "phpunit/phpunit" : "~5.0",
+        "scrutinizer/ocular": "1.1",
         "squizlabs/php_codesniffer": "~2.3.0"
     },
     "autoload": {

diff --git a/src/Controller/Component/ApiPaginationComponent.php b/src/Controller/Component/ApiPaginationComponent.php
@@ -42,9 +42,9 @@ public function beforeRender(Event $event)
             return;
         }
 
-        $subject = $event->subject();
-        $this->pagingInfo = $this->request->params['paging'][$subject->name];
-        $config = $this->config();
+        $subject = $event->getSubject();
+        $this->pagingInfo = $this->request->getParam('paging')[$subject->getName()];
+        $config = $this->getConfig();
 
         if (!empty($config['aliases'])) {
             $this->setAliases();
@@ -66,7 +66,7 @@ public function beforeRender(Event $event)
      */
     protected function setAliases()
     {
-        foreach ($this->config('aliases') as $key => $value) {
+        foreach ($this->getConfig('aliases') as $key => $value) {
             $this->pagingInfo[$value] = $this->pagingInfo[$key];
             unset($this->pagingInfo[$key]);
         }
@@ -80,7 +80,7 @@ protected function setAliases()
      */
     protected function setVisibility()
     {
-        $visible = $this->config('visible');
+        $visible = $this->getConfig('visible');
         foreach ($this->pagingInfo as $key => $value) {
             if (!in_array($key, $visible)) {
                 unset($this->pagingInfo[$key]);
@@ -96,7 +96,7 @@ protected function setVisibility()
      */
     protected function isPaginatedApiRequest()
     {
-        if (isset($this->request->params['paging']) &&
+        if ($this->request->getParam('paging') &&
             $this->request->is(['json', 'xml'])
         ) {
             return true;

diff --git a/tests/TestCase/Controller/Component/ApiPaginationComponentTest.php b/tests/TestCase/Controller/Component/ApiPaginationComponentTest.php
@@ -4,13 +4,15 @@
 use BryanCrowe\ApiPagination\Controller\Component\ApiPaginationComponent;
 use BryanCrowe\ApiPagination\TestApp\Controller\ArticlesController;
 use Cake\Event\Event;
-use Cake\Network\Request;
-use Cake\Network\Response;
+use Cake\Http\ServerRequest as Request;
+use Cake\Http\Response;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 
 /**
  * ApiPaginationComponentTest class
+ *
+ * @property ArticlesController $controller
  */
 class ApiPaginationComponentTest extends TestCase
 {
@@ -24,7 +26,7 @@ class ApiPaginationComponentTest extends TestCase
     public function setUp()
     {
         $this->request = new Request('/articles');
-        $this->response = $this->getMock('Cake\Network\Response');
+        $this->response = $this->createMock('Cake\Http\Response');
         $this->controller = new ArticlesController($this->request, $this->response);
         $this->Articles = TableRegistry::get('BryanCrowe/ApiPagination.Articles', ['table' => 'bryancrowe_articles']);
         parent::setUp();
@@ -61,7 +63,7 @@ public function testNonApiPaginatedRequest()
      */
     public function testDefaultPaginationSettings()
     {
-        $this->request->env('HTTP_ACCEPT', 'application/json');
+        $this->controller->request = $this->controller->request->withEnv('HTTP_ACCEPT', 'application/json');
         $this->controller->set('data', $this->controller->paginate($this->Articles));
         $apiPaginationComponent = new ApiPaginationComponent($this->controller->components());
         $event = new Event('Controller.beforeRender', $this->controller);
@@ -81,7 +83,9 @@ public function testDefaultPaginationSettings()
             'direction' => false,
             'limit' => null,
             'sortDefault' => false,
-            'directionDefault' => false
+            'directionDefault' => false,
+            'scope' => null,
+            'completeSort' => []
         ];
 
         $this->assertSame($expected, $result);
@@ -94,7 +98,7 @@ public function testDefaultPaginationSettings()
      */
     public function testVisibilitySettings()
     {
-        $this->request->env('HTTP_ACCEPT', 'application/json');
+        $this->controller->request = $this->controller->request->withEnv('HTTP_ACCEPT', 'application/json');
         $this->controller->set('data', $this->controller->paginate($this->Articles));
         $apiPaginationComponent = new ApiPaginationComponent($this->controller->components(), [
             'visible' => [
@@ -129,7 +133,7 @@ public function testVisibilitySettings()
      */
     public function testAliasSettings()
     {
-        $this->request->env('HTTP_ACCEPT', 'application/json');
+        $this->controller->request = $this->controller->request->withEnv('HTTP_ACCEPT', 'application/json');
         $this->controller->set('data', $this->controller->paginate($this->Articles));
         $apiPaginationComponent = new ApiPaginationComponent($this->controller->components(), [
             'aliases' => [
@@ -153,6 +157,8 @@ public function testAliasSettings()
             'limit' => null,
             'sortDefault' => false,
             'directionDefault' => false,
+            'scope' => null,
+            'completeSort' => [],
             'curPage' => 1,
             'currentCount' => 20,
             'totalCount' => 23,
@@ -168,7 +174,7 @@ public function testAliasSettings()
      */
     public function testKeySetting()
     {
-        $this->request->env('HTTP_ACCEPT', 'application/json');
+        $this->controller->request = $this->controller->request->withEnv('HTTP_ACCEPT', 'application/json');
         $this->controller->set('data', $this->controller->paginate($this->Articles));
         $apiPaginationComponent = new ApiPaginationComponent($this->controller->components(), [
             'key' => 'paging'
@@ -190,7 +196,9 @@ public function testKeySetting()
             'direction' => false,
             'limit' => null,
             'sortDefault' => false,
-            'directionDefault' => false
+            'directionDefault' => false,
+            'scope' => null,
+            'completeSort' => []
         ];
 
         $this->assertSame($expected, $result);
@@ -203,7 +211,7 @@ public function testKeySetting()
      */
     public function testAllSettings()
     {
-        $this->request->env('HTTP_ACCEPT', 'application/json');
+        $this->controller->request = $this->controller->request->withEnv('HTTP_ACCEPT', 'application/json');
         $this->controller->set('data', $this->controller->paginate($this->Articles));
         $apiPaginationComponent = new ApiPaginationComponent($this->controller->components(), [
             'key' => 'fun',