Browse Source

Merge pull request #12471 from sohelrana820/small-php-issue

Small php issue
Mark Story 7 years ago
parent
commit
65d9663f15

+ 1 - 1
tests/TestCase/Collection/CollectionTest.php

@@ -1667,7 +1667,7 @@ class CollectionTest extends TestCase
     /**
      * Provider for testing each of the directions for listNested
      *
-     * @return void
+     * @return array
      */
     public function nestedListProvider()
     {

+ 1 - 1
tests/TestCase/Controller/ControllerTest.php

@@ -474,7 +474,7 @@ class ControllerTest extends TestCase
     /**
      * Generates status codes for redirect test.
      *
-     * @return void
+     * @return array
      */
     public static function statusCodeProvider()
     {

+ 2 - 2
tests/TestCase/Core/AppTest.php

@@ -114,7 +114,7 @@ class AppTest extends TestCase
      *  existsInBase (Base meaning App or plugin namespace)
      *  expected return value
      *
-     * @return void
+     * @return array
      */
     public function classnameProvider()
     {
@@ -169,7 +169,7 @@ class AppTest extends TestCase
      *  suffix
      *  expected return value
      *
-     * @return void
+     * @return array
      */
     public function shortNameProvider()
     {

+ 2 - 2
tests/TestCase/Database/Type/DecimalTypeTest.php

@@ -100,13 +100,13 @@ class DecimalTypeTest extends TestCase
             'a' => null,
             'b' => '2.3',
             'c' => '15',
-            'c' => '0.0',
+            'd' => '0.0',
         ];
         $expected = [
             'a' => null,
             'b' => 2.3,
             'c' => 15,
-            'c' => 0.0,
+            'd' => 0.0,
         ];
         $this->assertEquals(
             $expected,

+ 2 - 2
tests/TestCase/Database/Type/FloatTypeTest.php

@@ -100,13 +100,13 @@ class FloatTypeTest extends TestCase
             'a' => null,
             'b' => '2.3',
             'c' => '15',
-            'c' => '0.0',
+            'd' => '0.0',
         ];
         $expected = [
             'a' => null,
             'b' => 2.3,
             'c' => 15,
-            'c' => 0.0,
+            'd' => 0.0,
         ];
         $this->assertEquals(
             $expected,

+ 4 - 4
tests/TestCase/Database/Type/IntegerTypeTest.php

@@ -78,15 +78,15 @@ class IntegerTypeTest extends TestCase
             'a' => null,
             'b' => '2.3',
             'c' => '15',
-            'c' => '0.0',
-            'd' => 10
+            'd' => '0.0',
+            'e' => 10
         ];
         $expected = [
             'a' => null,
             'b' => 2,
             'c' => 15,
-            'c' => 0,
-            'd' => 10
+            'd' => 0,
+            'e' => 10
         ];
         $this->assertEquals(
             $expected,

+ 2 - 2
tests/TestCase/Database/Type/JsonTypeTest.php

@@ -68,13 +68,13 @@ class JsonTypeTest extends TestCase
             'a' => null,
             'b' => json_encode([1, 2, 3]),
             'c' => json_encode('123'),
-            'c' => json_encode(2.3),
+            'd' => json_encode(2.3),
         ];
         $expected = [
             'a' => null,
             'b' => [1, 2, 3],
             'c' => 123,
-            'c' => 2.3,
+            'd' => 2.3,
         ];
         $this->assertEquals(
             $expected,

+ 1 - 1
tests/TestCase/Database/TypeTest.php

@@ -74,7 +74,7 @@ class TypeTest extends TestCase
     /**
      * provides a basics type list to be used as data provided for a test
      *
-     * @return void
+     * @return array
      */
     public function basicTypesProvider()
     {

+ 2 - 2
tests/TestCase/Error/ExceptionRendererTest.php

@@ -102,7 +102,7 @@ class TestErrorController extends Controller
     /**
      * index method
      *
-     * @return void
+     * @return array
      */
     public function index()
     {
@@ -121,7 +121,7 @@ class MyCustomExceptionRenderer extends ExceptionRenderer
     /**
      * custom error message type.
      *
-     * @return void
+     * @return string
      */
     public function missingWidgetThing()
     {

+ 1 - 1
tests/TestCase/Filesystem/FileTest.php

@@ -533,7 +533,7 @@ class FileTest extends TestCase
     /**
      * testAppend method
      *
-     * @return void
+     * @return boolean|void
      */
     public function testAppend()
     {

+ 2 - 2
tests/TestCase/I18n/DateTest.php

@@ -58,7 +58,7 @@ class DateTest extends TestCase
     /**
      * Provider for ensuring that Date and FrozenDate work the same way.
      *
-     * @return void
+     * @return array
      */
     public static function classNameProvider()
     {
@@ -268,7 +268,7 @@ class DateTest extends TestCase
     /**
      * provider for timeAgo with an end date.
      *
-     * @return void
+     * @return array
      */
     public function timeAgoEndProvider()
     {

+ 2 - 2
tests/TestCase/I18n/TimeTest.php

@@ -72,7 +72,7 @@ class TimeTest extends TestCase
     /**
      * Provider for ensuring that Time and FrozenTime work the same way.
      *
-     * @return void
+     * @return array
      */
     public static function classNameProvider()
     {
@@ -150,7 +150,7 @@ class TimeTest extends TestCase
     /**
      * provider for timeAgo with an end date.
      *
-     * @return void
+     * @return array
      */
     public function timeAgoEndProvider()
     {

+ 1 - 1
tests/TestCase/Log/Engine/FileLogTest.php

@@ -46,7 +46,7 @@ class JsonObject implements JsonSerializable
     /**
      * String representation of the object
      *
-     * @return string
+     * @return array
      */
     public function jsonSerialize()
     {

+ 1 - 1
tests/TestCase/ORM/BehaviorTest.php

@@ -143,7 +143,7 @@ class Test3Behavior extends Behavior
      *
      * This class does pretend to implement beforeFind
      *
-     * @return void
+     * @return array
      */
     public function implementedEvents()
     {

+ 2 - 2
tests/TestCase/ORM/BindingKeyTest.php

@@ -36,7 +36,7 @@ class BindingKeyTest extends TestCase
     /**
      * Data provider for the two types of strategies BelongsTo and HasOne implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderJoinable()
     {
@@ -46,7 +46,7 @@ class BindingKeyTest extends TestCase
     /**
      * Data provider for the two types of strategies HasMany and BelongsToMany implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderExternal()
     {

+ 4 - 4
tests/TestCase/ORM/CompositeKeysTest.php

@@ -68,7 +68,7 @@ class CompositeKeyTest extends TestCase
     /**
      * Data provider for the two types of strategies HasOne implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderHasOne()
     {
@@ -78,7 +78,7 @@ class CompositeKeyTest extends TestCase
     /**
      * Data provider for the two types of strategies HasMany implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderHasMany()
     {
@@ -88,7 +88,7 @@ class CompositeKeyTest extends TestCase
     /**
      * Data provider for the two types of strategies BelongsTo implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderBelongsTo()
     {
@@ -98,7 +98,7 @@ class CompositeKeyTest extends TestCase
     /**
      * Data provider for the two types of strategies BelongsToMany implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderBelongsToMany()
     {

+ 1 - 1
tests/TestCase/ORM/EntityTest.php

@@ -1560,7 +1560,7 @@ class EntityTest extends TestCase
     /**
      * Provides empty values
      *
-     * @return void
+     * @return array
      */
     public function emptyNamesProvider()
     {

+ 3 - 3
tests/TestCase/ORM/QueryTest.php

@@ -111,7 +111,7 @@ class QueryTest extends TestCase
     /**
      * Data provider for the two types of strategies HasMany implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderHasMany()
     {
@@ -121,7 +121,7 @@ class QueryTest extends TestCase
     /**
      * Data provider for the two types of strategies BelongsTo implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderBelongsTo()
     {
@@ -131,7 +131,7 @@ class QueryTest extends TestCase
     /**
      * Data provider for the two types of strategies BelongsToMany implements
      *
-     * @return void
+     * @return array
      */
     public function strategiesProviderBelongsToMany()
     {

+ 1 - 1
tests/TestCase/Validation/ValidationTest.php

@@ -2733,7 +2733,7 @@ class ValidationTest extends TestCase
     /**
      * Provider for uploaded file tests.
      *
-     * @return void
+     * @return array
      */
     public function uploadedFileProvider()
     {

+ 1 - 1
tests/test_app/TestApp/Controller/CakesController.php

@@ -39,7 +39,7 @@ class CakesController extends Controller
     /**
      * invalid method
      *
-     * @return \Cake\Http\Response
+     * @return string
      */
     public function invalid()
     {