Merge branch 'sebastianbergmann:master' into master

Author: plucht

src/annotations.rst

@@ -684,6 +684,7 @@ The ``@testdox`` annotation can be applied to both test classes and test methods
    of the ``@test`` annotation.
 
 When using the ``@testdox`` annotation at method level with a ``@dataProvider`` you may use the method parameters as placeholders in your alternative description.
+``$_dataName`` is available in addition to use the actual name of the current data. That would be ``data set 1`` up to 4 in below example.
 
 .. code-block:: php
 
@@ -699,10 +700,10 @@ When using the ``@testdox`` annotation at method level with a ``@dataProvider``
     public function additionProvider()
     {
         return [
-            [0, 0, 0],
-            [0, 1, 1],
-            [1, 0, 1],
-            [1, 1, 3]
+            'data set 1' => [0, 0, 0],
+            'data set 2' => [0, 1, 1],
+            'data set 3' => [1, 0, 1],
+            'data set 4' => [1, 1, 3]
         ];
     }
 

src/code-coverage-analysis.rst

@@ -100,20 +100,20 @@ This can either be done using the ``--coverage-filter``
 :ref:`command line <textui.clioptions>` option or via the
 configuration file (see :ref:`appendixes.configuration.coverage.include`).
 
-The ``includeUncoveredFilesInCodeCoverageReport`` and ``processUncoveredFilesForCodeCoverageReport`` configuration settings are available to configure how the filter is used:
+The ``includeUncoveredFiles`` and ``processUncoveredFiles`` configuration settings are available to configure how the filter is used:
 
-- ``includeUncoveredFilesInCodeCoverageReport="false"`` means that only files that have at least one line of executed code are included in the code coverage report
+- ``includeUncoveredFiles="false"`` means that only files that have at least one line of executed code are included in the code coverage report
 
-- ``includeUncoveredFilesInCodeCoverageReport="true"`` (default) means that all files are included in the code coverage report even if not a single line of code of such a file is executed
+- ``includeUncoveredFiles="true"`` (default) means that all files are included in the code coverage report even if not a single line of code of such a file is executed
 
-- ``processUncoveredFilesForCodeCoverageReport="false"`` (default) means that a file that has no executed lines of code will be added to the code coverage report (if ``includeUncoveredFilesInCodeCoverageReport="true"`` is set) but it will not be loaded by PHPUnit and it will therefore not be analysed for correct executable lines of code information
+- ``processUncoveredFiles="false"`` (default) means that a file that has no executed lines of code will be added to the code coverage report (if ``includeUncoveredFiles="true"`` is set) but it will not be loaded by PHPUnit and it will therefore not be analysed for correct executable lines of code information
 
-- ``processUncoveredFilesForCodeCoverageReport="true"`` means that a file that has no executed lines of code will be loaded by PHPUnit so that it can be analysed for correct executable lines of code information
+- ``processUncoveredFiles="true"`` means that a file that has no executed lines of code will be loaded by PHPUnit so that it can be analysed for correct executable lines of code information
 
 .. admonition:: Note
 
    Please note that the loading of sourcecode files that is performed when
-   ``processUncoveredFilesForCodeCoverageReport="true"`` is set can
+   ``processUncoveredFiles="true"`` is set can
    cause problems when a sourcecode file contains code outside the scope of
    a class or function, for instance.
 

src/extending-phpunit.rst

@@ -174,10 +174,10 @@ definition to the extension class:
 
         protected $config_value_2 = 0;
 
-        public function __construct(string $value1 = '', int $value2 = 0)
+        public function __construct(string $config_value_1 = '', int $config_value_2 = 0)
         {
-            $this->config_value_1 = $config_1;
-            $this->config_value_2 = $config_2;
+            $this->config_value_1 = $config_value_1;
+            $this->config_value_2 = $config_value_2;
         }
 
         public function executeBeforeFirstTest(): void

src/test-doubles.rst

@@ -182,9 +182,32 @@ the same best practice defaults used by ``createStub()``.
     }
 
 In the examples so far we have been returning simple values using
-``willReturn($value)``. This short syntax is the same as
-``will($this->returnValue($value))``. We can use variations
-on this longer syntax to achieve more complex stubbing behaviour.
+``willReturn($value)`` – a short syntax for convenience. :numref:`test-doubles.stubs.shorthands` shows the
+available stubbing short hands alongside their longer counterparts.
+
+.. rst-class:: table
+.. list-table:: Stubbing short hands
+    :name: test-doubles.stubs.shorthands
+    :header-rows: 1
+
+    * - short hand
+      - longer syntax
+    * - ``willReturn($value)``
+      - ``will($this->returnValue($value))``
+    * - ``willReturnArgument($argumentIndex)``
+      - ``will($this->returnArgument($argumentIndex))``
+    * - ``willReturnCallback($callback)``
+      - ``will($this->returnCallback($callback))``
+    * - ``willReturnMap($valueMap)``
+      - ``will($this->returnValueMap($valueMap))``
+    * - ``willReturnOnConsecutiveCalls($value1, $value2)``
+      - ``will($this->onConsecutiveCalls($value1, $value2))``
+    * - ``willReturnSelf()``
+      - ``will($this->returnSelf())``
+    * - ``willThrowException($exception)``
+      - ``will($this->throwException($exception))``
+
+We can use variations on this longer syntax to achieve more complex stubbing behaviour.
 
 Sometimes you want to return one of the arguments of a method call
 (unchanged) as the result of a stubbed method call.
@@ -587,7 +610,7 @@ method being mocked, like in ``with()``.
         public function testFunctionCalledTwoTimesWithSpecificArguments(): void
         {
             $mock = $this->getMockBuilder(stdClass::class)
-                         ->setMethods(['set'])
+                         ->addMethods(['set'])
                          ->getMock();
 
             $mock->expects($this->exactly(2))
@@ -658,7 +681,7 @@ argument passes verification and ``false`` otherwise.
             $expectedObject = new stdClass;
 
             $mock = $this->getMockBuilder(stdClass::class)
-                         ->setMethods(['foo'])
+                         ->addMethods(['foo'])
                          ->getMock();
 
             $mock->expects($this->once())
@@ -733,11 +756,15 @@ Here is a list of methods provided by the Mock Builder:
 
 -
 
-  ``setMethods(array $methods)`` can be called on the Mock Builder object to specify the methods that are to be replaced with a configurable test double. The behavior of the other methods is not changed. If you call ``setMethods(null)``, then no methods will be replaced.
+  ``onlyMethods(array $methods)`` can be called on the Mock Builder object to specify the methods that are to be replaced with a configurable test double. The behavior of the other methods is not changed. Each method must exist in the given mock class.
+
+-
+
+  ``addMethods(array $methods)`` can be called on the Mock Builder object to specify the methods that don't exist (yet) in the given mock class. The behavior of the other methods remains the same.
 
 -
 
-  ``setMethodsExcept(array $methods)`` can be called on the Mock Builder object to specify the methods that will not be replaced with a configurable test double while replacing all other public methods. This works inverse to ``setMethods()``.
+  ``setMethodsExcept(array $methods)`` can be called on the Mock Builder object to specify the methods that will not be replaced with a configurable test double while replacing all other public methods. This works inverse to ``onlyMethods()``.
 
 -
 

src/textui.rst

@@ -303,7 +303,7 @@ the following code:
         --filter 'TestNamespace\\TestCaseClass::testMethod'
         --filter 'TestNamespace\\TestCaseClass'
         --filter TestNamespace
-        --filter TestCaseClase
+        --filter TestCaseClass
         --filter testMethod
         --filter '/::testMethod .*"my named data"/'
         --filter '/::testMethod .*#5$/'

src/writing-tests-for-phpunit.rst

@@ -438,6 +438,11 @@ Output will be more verbose as it'll contain that name of a dataset that breaks
             rewind($this->file);
 
             $this->current = fgetcsv($this->file);
+
+            if (is_array($row)) {
+                $row = array_map('intval', $row);
+            }
+            
             $this->key     = 0;
         }
 
@@ -460,6 +465,10 @@ Output will be more verbose as it'll contain that name of a dataset that breaks
         {
             $this->current = fgetcsv($this->file);
 
+            if (is_array($row)) {
+                $row = array_map('intval', $row);
+            }
+
             $this->key++;
         }
     }