Merge pull request #716 from cakephp/dereuromark-patch-1

php74 stable

Author: markstory

.travis.yml

@@ -3,8 +3,7 @@ language: php
 php:
   - 5.6
   - 7.0
-  - 7.3
-  - 7.4snapshot
+  - 7.4
 
 services:
   - postgresql
@@ -21,18 +20,15 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
+    - php: 7.3
       env: PHPCS=1
 
-    - php: 7.1
+    - php: 7.3
       env: CODECOVERAGE=1 DEFAULT=0
 
     - php: 5.6
       env: PREFER_LOWEST=1
 
-  allow_failures:
-    - php: 7.4snapshot
-
 install:
   - sh -c "if [ '$PREFER_LOWEST' != '1' ]; then composer install --prefer-dist --no-interaction; fi"
   - sh -c "if [ '$PREFER_LOWEST' = '1' ]; then composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi"
@@ -43,9 +39,9 @@ before_script:
 
 script:
   - sh -c "if [ '$DEFAULT' = '1' ]; then [ "$(find . \( -path './vendor' \) -prune -o -type f \( -name '*.ctp' -o -name '*.php' \) -print0 | xargs -0 --no-run-if-empty -L1 -i'{}' php -l '{}' | grep -vc 'No syntax errors')" -eq 0 ]; fi"
-  - sh -c "if [ '$DEFAULT' = '1' ]; then ./vendor/bin/phpunit; fi"
+  - sh -c "if [ '$DEFAULT' = '1' ]; then vendor/bin/phpunit; fi"
 
-  - sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
+  - sh -c "if [ '$PHPCS' = '1' ]; then composer cs-check; fi"
 
   - sh -c "if [ '$CODECOVERAGE' = '1' ]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml || true; fi"
   - sh -c "if [ '$CODECOVERAGE' = '1' ]; then wget -O codecov.sh https://codecov.io/bash; fi"

src/Model/Entity/Panel.php

@@ -38,6 +38,7 @@ class Panel extends Entity
      * Over certain sizes PDO will return file handles.
      * For backwards compatibility and consistency we smooth over that difference here.
      *
+     * @param mixed $content Content
      * @return string
      */
     protected function _getContent($content)

src/Routing/Filter/DebugBarFilter.php

@@ -128,7 +128,7 @@ public function beforeDispatch(Event $event)
      * Save the toolbar data.
      *
      * @param \Cake\Event\Event $event The afterDispatch event.
-     * @return \Cake\Http\Response|null Modifed response or null
+     * @return \Psr\Http\Message\ResponseInterface|void Modified response or null
      */
     public function afterDispatch(Event $event)
     {

src/Shell/BenchmarkShell.php

@@ -23,9 +23,6 @@
  * functionally similar to Apache AB
  *
  * @since         DebugKit 1.0
- * @todo Print/export time detail information
- * @todo Export/graphing of data to .dot format for graphviz visualization
- * @todo Make calculated results round to leading significant digit position of std dev.
  */
 class BenchmarkShell extends Shell
 {

src/View/Helper/TidyHelper.php

@@ -73,6 +73,7 @@ public function process($html = '', &$out = '')
                 if (isset($markup[$line - 1])) {
                     $string .= h($markup[$line - 1]);
                 }
+                // phpcs:ignore
                 $string .= '<strong>' . h(@$markup[$line]) . '</strong>';
                 if (isset($markup[$line + 1])) {
                     $string .= h($markup[$line + 1]);

src/View/Helper/ToolbarHelper.php

@@ -47,6 +47,7 @@ class ToolbarHelper extends Helper
      * set sorting of values
      *
      * @param bool $sort Whether or not sort values by key
+     * @return void
      */
     public function setSort($sort)
     {

tests/TestCase/Panel/VariablesPanelTest.php

@@ -107,8 +107,13 @@ public function testShutdown()
         });
         $this->assertRegExp('/^\[stream\] Resource id #\d+$/', $output['content']['resource']);
         $this->assertInternalType('array', $output['content']['unserializableDebugInfo']);
+        if (version_compare(PHP_VERSION, '7.4.0', '>=')) {
+            $expectedErrorMessage = "Unserializable object - stdClass. Error: Serialization of 'PDO' is not allowed";
+        } else {
+            $expectedErrorMessage = 'Unserializable object - stdClass. Error: You cannot serialize or unserialize PDO instances';
+        }
         $this->assertStringStartsWith(
-            'Unserializable object - stdClass. Error: You cannot serialize or unserialize PDO instances',
+            $expectedErrorMessage,
             $output['content']['unserializableDebugInfo']['unserializable']
         );
         $this->assertStringStartsWith(

tests/TestCase/Routing/Filter/DebugBarFilterTest.php

@@ -135,11 +135,7 @@ public function testAfterDispatchIgnoreStreamBodies()
         $bar = new DebugBarFilter($this->events, []);
         $event = new Event('Dispatcher.afterDispatch', $bar, compact('request', 'response'));
         $bar->afterDispatch($event);
-        if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
-            $this->assertEquals('I am a teapot!', $response->getBody());
-        } else {
-            $this->assertInstanceOf('Closure', $response->getBody());
-        }
+        $this->assertEquals('I am a teapot!', $response->getBody());
     }
 
     /**

tests/TestCase/ToolbarServiceTest.php

@@ -306,11 +306,7 @@ public function testInjectScriptsStreamBodies()
 
         $result = $bar->injectScripts($row, $response);
         $this->assertInstanceOf('Cake\Http\Response', $result);
-        if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
-            $this->assertEquals('I am a teapot!', $response->getBody());
-        } else {
-            $this->assertInstanceOf('Closure', $response->getBody());
-        }
+        $this->assertEquals('I am a teapot!', $response->getBody());
     }
 
     /**