Merge branch 'master' into 3.next

src/Console/ConsoleOutput.php

@@ -95,7 +95,7 @@ class ConsoleOutput
      */
     protected static $_foregroundColors = [
         'black' => 30,
-        'red' => 91,
+        'red' => 31,
         'green' => 32,
         'yellow' => 33,
         'blue' => 34,

src/Datasource/Exception/PageOutOfBoundsException.php

@@ -25,14 +25,7 @@ class PageOutOfBoundsException extends Exception
     protected $_messageTemplate = 'Page number %s could not be found.';
 
     /**
-     * Constructor
-     *
-     * @param array|null $message Paging info.
-     * @param int $code The code of the error, is also the HTTP status code for the error.
-     * @param \Exception|null $previous The previous exception.
+     * {@inheritDoc}
      */
-    public function __construct($message = null, $code = 404, $previous = null)
-    {
-        parent::__construct($message, $code, $previous = null);
-    }
+    protected $_defaultCode = 404;
 }

src/Validation/Validation.php

@@ -178,7 +178,7 @@ class Validation
                 'disc' => '/^(?:6011|650\\d)\\d{12}$/',
                 'electron' => '/^(?:417500|4917\\d{2}|4913\\d{2})\\d{10}$/',
                 'enroute' => '/^2(?:014|149)\\d{11}$/',
-                'jcb' => '/^(35\\d{3}|2131|1800)\\d{11}$/',
+                'jcb' => '/^(3\\d{4}|2131|1800)\\d{11}$/',
                 'maestro' => '/^(?:5020|6\\d{3})\\d{12}$/',
                 'mc' => '/^(5[1-5]\\d{14})|(2(?:22[1-9]|2[3-9][0-9]|[3-6][0-9]{2}|7[0-1][0-9]|720)\\d{12})$/',
                 'solo' => '/^(6334[5-9][0-9]|6767[0-9]{2})\\d{10}(\\d{2,3})?$/',

tests/TestCase/Console/ConsoleOutputTest.php

@@ -144,7 +144,7 @@ class ConsoleOutputTest extends TestCase
     public function testFormattingSimple()
     {
         $this->output->expects($this->once())->method('_write')
-            ->with("\033[91mError:\033[0m Something bad");
+            ->with("\033[31mError:\033[0m Something bad");
 
         $this->output->write('<error>Error:</error> Something bad', false);
     }
@@ -203,7 +203,7 @@ class ConsoleOutputTest extends TestCase
     public function testFormattingMultipleStylesName()
     {
         $this->output->expects($this->once())->method('_write')
-            ->with("\033[91mBad\033[0m \033[33mWarning\033[0m Regular");
+            ->with("\033[31mBad\033[0m \033[33mWarning\033[0m Regular");
 
         $this->output->write('<error>Bad</error> <warning>Warning</warning> Regular', false);
     }
@@ -216,7 +216,7 @@ class ConsoleOutputTest extends TestCase
     public function testFormattingMultipleSameTags()
     {
         $this->output->expects($this->once())->method('_write')
-            ->with("\033[91mBad\033[0m \033[91mWarning\033[0m Regular");
+            ->with("\033[31mBad\033[0m \033[31mWarning\033[0m Regular");
 
         $this->output->write('<error>Bad</error> <error>Warning</error> Regular', false);
     }

tests/TestCase/ExceptionsTest.php

@@ -145,6 +145,7 @@ class ExceptionsTest extends TestCase
             ['Cake\Datasource\Exception\MissingDatasourceConfigException', 500],
             ['Cake\Datasource\Exception\MissingDatasourceException', 500],
             ['Cake\Datasource\Exception\MissingModelException', 500],
+            ['Cake\Datasource\Exception\PageOutOfBoundsException', 404],
             ['Cake\Datasource\Exception\RecordNotFoundException', 404],
             ['Cake\Mailer\Exception\MissingActionException', 404],
             ['Cake\Mailer\Exception\MissingMailerException', 500],

tests/TestCase/Validation/ValidationTest.php

@@ -277,36 +277,36 @@ class ValidationTest extends TestCase
         $this->assertTrue(Validation::cc('180031358949367', ['jcb']));
         $this->assertTrue(Validation::cc('180033802147846', ['jcb']));
         // JCB 16 digit
-        $this->assertTrue(Validation::cc('3586806857839936', ['jcb']));
-        $this->assertTrue(Validation::cc('3558699503187097', ['jcb']));
-        $this->assertTrue(Validation::cc('3529549607186576', ['jcb']));
-        $this->assertTrue(Validation::cc('3529332922425601', ['jcb']));
-        $this->assertTrue(Validation::cc('3529001541159236', ['jcb']));
-        $this->assertTrue(Validation::cc('3529162495317848', ['jcb']));
-        $this->assertTrue(Validation::cc('3537562627732766', ['jcb']));
-        $this->assertTrue(Validation::cc('3537107161330773', ['jcb']));
+        $this->assertTrue(Validation::cc('3096806857839939', ['jcb']));
+        $this->assertTrue(Validation::cc('3158699503187091', ['jcb']));
+        $this->assertTrue(Validation::cc('3112549607186579', ['jcb']));
+        $this->assertTrue(Validation::cc('3112332922425604', ['jcb']));
+        $this->assertTrue(Validation::cc('3112001541159239', ['jcb']));
+        $this->assertTrue(Validation::cc('3112162495317841', ['jcb']));
+        $this->assertTrue(Validation::cc('3337562627732768', ['jcb']));
+        $this->assertTrue(Validation::cc('3337107161330775', ['jcb']));
         $this->assertTrue(Validation::cc('3528053736003621', ['jcb']));
         $this->assertTrue(Validation::cc('3528915255020360', ['jcb']));
-        $this->assertTrue(Validation::cc('3546786059660927', ['jcb']));
+        $this->assertTrue(Validation::cc('3096786059660921', ['jcb']));
         $this->assertTrue(Validation::cc('3528264799292320', ['jcb']));
-        $this->assertTrue(Validation::cc('3536469164130134', ['jcb']));
-        $this->assertTrue(Validation::cc('3529127443822850', ['jcb']));
-        $this->assertTrue(Validation::cc('3596849995802323', ['jcb']));
+        $this->assertTrue(Validation::cc('3096469164130136', ['jcb']));
+        $this->assertTrue(Validation::cc('3112127443822853', ['jcb']));
+        $this->assertTrue(Validation::cc('3096849995802328', ['jcb']));
         $this->assertTrue(Validation::cc('3528090735127407', ['jcb']));
-        $this->assertTrue(Validation::cc('3529101006819231', ['jcb']));
-        $this->assertTrue(Validation::cc('3537444428040782', ['jcb']));
-        $this->assertTrue(Validation::cc('3588043154151066', ['jcb']));
-        $this->assertTrue(Validation::cc('3588295969414861', ['jcb']));
-        $this->assertTrue(Validation::cc('3558748843158571', ['jcb']));
-        $this->assertTrue(Validation::cc('3558709206148534', ['jcb']));
-        $this->assertTrue(Validation::cc('3558365159575320', ['jcb']));
-        $this->assertTrue(Validation::cc('3558671691305161', ['jcb']));
+        $this->assertTrue(Validation::cc('3112101006819234', ['jcb']));
+        $this->assertTrue(Validation::cc('3337444428040784', ['jcb']));
+        $this->assertTrue(Validation::cc('3088043154151061', ['jcb']));
+        $this->assertTrue(Validation::cc('3088295969414866', ['jcb']));
+        $this->assertTrue(Validation::cc('3158748843158575', ['jcb']));
+        $this->assertTrue(Validation::cc('3158709206148538', ['jcb']));
+        $this->assertTrue(Validation::cc('3158365159575324', ['jcb']));
+        $this->assertTrue(Validation::cc('3158671691305165', ['jcb']));
         $this->assertTrue(Validation::cc('3528523028771093', ['jcb']));
-        $this->assertTrue(Validation::cc('3576057126267879', ['jcb']));
-        $this->assertTrue(Validation::cc('3558514047166830', ['jcb']));
+        $this->assertTrue(Validation::cc('3096057126267870', ['jcb']));
+        $this->assertTrue(Validation::cc('3158514047166834', ['jcb']));
         $this->assertTrue(Validation::cc('3528274546125962', ['jcb']));
         $this->assertTrue(Validation::cc('3528890967705733', ['jcb']));
-        $this->assertTrue(Validation::cc('3537198811307543', ['jcb']));
+        $this->assertTrue(Validation::cc('3337198811307545', ['jcb']));
         // Maestro (debit card)
         $this->assertTrue(Validation::cc('5020147409985219', ['maestro']));
         $this->assertTrue(Validation::cc('5020931809905616', ['maestro']));
@@ -648,7 +648,7 @@ class ValidationTest extends TestCase
         // JCB 15 digit
         $this->assertTrue(Validation::luhn('213134762247898'));
         // JCB 16 digit
-        $this->assertTrue(Validation::luhn('3586806857839936'));
+        $this->assertTrue(Validation::luhn('3096806857839939'));
         // Maestro (debit card)
         $this->assertTrue(Validation::luhn('5020147409985219'));
         // Mastercard
@@ -755,7 +755,7 @@ class ValidationTest extends TestCase
         // JCB 15 digit
         $this->assertTrue(Validation::cc('213134762247898', 'all'));
         // JCB 16 digit
-        $this->assertTrue(Validation::cc('3586806857839936', 'all'));
+        $this->assertTrue(Validation::cc('3096806857839939', 'all'));
         // Maestro (debit card)
         $this->assertTrue(Validation::cc('5020147409985219', 'all'));
         // Mastercard
@@ -806,7 +806,7 @@ class ValidationTest extends TestCase
         // JCB 15 digit
         $this->assertTrue(Validation::cc('213134762247898', 'all', true));
         // JCB 16 digit
-        $this->assertTrue(Validation::cc('3586806857839936', 'all', true));
+        $this->assertTrue(Validation::cc('3096806857839939', 'all', true));
         // Maestro (debit card)
         $this->assertTrue(Validation::cc('5020147409985219', 'all', true));
         // Mastercard