Merge remote-tracking branch 'upstream/develop' into 4.3

Author: kenjis

.php-cs-fixer.dist.php

@@ -38,7 +38,11 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [];
+$overrides = [
+    'no_useless_concat_operator' => [
+        'juggle_simple_strings' => true,
+    ],
+];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',

.php-cs-fixer.no-header.php

@@ -30,7 +30,11 @@
         __DIR__ . '/admin/starter/builds',
     ]);
 
-$overrides = [];
+$overrides = [
+    'no_useless_concat_operator' => [
+        'juggle_simple_strings' => true,
+    ],
+];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.no-header.cache',

.php-cs-fixer.user-guide.php

@@ -33,6 +33,9 @@
     'php_unit_internal_class'     => false,
     'no_unused_imports'           => false,
     'class_attributes_separation' => false,
+    'no_useless_concat_operator'  => [
+        'juggle_simple_strings' => true,
+    ],
 ];
 
 $options = [

system/Database/BaseBuilder.php

@@ -1192,7 +1192,7 @@ public function unionAll($union)
      */
     protected function addUnionStatement($union, bool $all = false)
     {
-        $this->QBUnion[] = "\n" . 'UNION '
+        $this->QBUnion[] = "\nUNION "
             . ($all ? 'ALL ' : '')
             . 'SELECT * FROM '
             . $this->buildSubquery($union, true, 'uwrp' . (count($this->QBUnion) + 1));

system/Database/MySQLi/Connection.php

@@ -360,7 +360,7 @@ public function escapeLikeStringDirect($str)
         // Escape LIKE condition wildcards
         return str_replace(
             [$this->likeEscapeChar, '%', '_'],
-            ['\\' . $this->likeEscapeChar, '\\' . '%', '\\' . '_'],
+            ['\\' . $this->likeEscapeChar, '\\%', '\\_'],
             $str
         );
     }

system/Debug/Toolbar.php

@@ -381,7 +381,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
                 mkdir(WRITEPATH . 'debugbar', 0777);
             }
 
-            write_file(WRITEPATH . 'debugbar/' . 'debugbar_' . $time . '.json', $data, 'w+');
+            write_file(WRITEPATH . 'debugbar/debugbar_' . $time . '.json', $data, 'w+');
 
             $format = $response->getHeaderLine('content-type');
 

system/HTTP/IncomingRequest.php

@@ -615,6 +615,9 @@ public function getPost($index = null, $filter = null, $flags = null)
      */
     public function getPostGet($index = null, $filter = null, $flags = null)
     {
+        if ($index === null) {
+            return array_merge($this->getGet($index, $filter, $flags), $this->getPost($index, $filter, $flags));
+        }
         // Use $_POST directly here, since filter_has_var only
         // checks the initial POST data, not anything that might
         // have been added since.
@@ -632,6 +635,9 @@ public function getPostGet($index = null, $filter = null, $flags = null)
      */
     public function getGetPost($index = null, $filter = null, $flags = null)
     {
+        if ($index === null) {
+            return array_merge($this->getPost($index, $filter, $flags), $this->getGet($index, $filter, $flags));
+        }
         // Use $_GET directly here, since filter_has_var only
         // checks the initial GET data, not anything that might
         // have been added since.

system/Helpers/form_helper.php

@@ -485,13 +485,13 @@ function form_datalist(string $name, string $value, array $options): string
 
         $out = form_input($data) . "\n";
 
-        $out .= "<datalist id='" . $name . '_list' . "'>";
+        $out .= "<datalist id='" . $name . "_list'>";
 
         foreach ($options as $option) {
-            $out .= "<option value='{$option}'>" . "\n";
+            $out .= "<option value='{$option}'>\n";
         }
 
-        return $out . ('</datalist>' . "\n");
+        return $out . ("</datalist>\n");
     }
 }
 

system/View/Parser.php

@@ -277,7 +277,7 @@ protected function parsePair(string $variable, array $data, string $template): a
         // have something to loop over.
         preg_match_all(
             '#' . $this->leftDelimiter . '\s*' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '(.+?)' .
-            $this->leftDelimiter . '\s*' . '/' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '#s',
+            $this->leftDelimiter . '\s*/' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '#s',
             $template,
             $matches,
             PREG_SET_ORDER

tests/system/HTTP/IncomingRequestTest.php

@@ -569,6 +569,26 @@ public function testGetPostEmpty()
         $this->assertSame($_GET, $this->request->getGetPost());
     }
 
+    public function testPostGetSecondStream()
+    {
+        $_GET['get'] = '3';
+        $this->assertSame($_GET, $this->request->getPostGet());
+    }
+
+    public function testGetPostSecondStream()
+    {
+        $_POST['post'] = '5';
+        $this->assertSame($_POST, $this->request->getGetPost());
+    }
+
+    public function testGetPostSecondStreams()
+    {
+        $_GET['get']   = '3';
+        $_POST['post'] = '5';
+        $this->assertSame(array_merge($_GET, $_POST), $this->request->getPostGet());
+        $this->assertSame(array_merge($_POST, $_GET), $this->request->getGetPost());
+    }
+
     public function testWithFalseBody()
     {
         // Use `false` here to simulate file_get_contents returning a false value