[pdosqlexec] Fixed PHP 8 compat, Code Cleanup and tests (#1628)

phingofficial · Aug 22, 2021 · 7e6e753 · 7e6e753
1 parent bb891e1
commit 7e6e753
Show file tree

Hide file tree

Showing 16 changed files with 333 additions and 125 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ tests/etc/tasks/system/defaultexcludestestinput/
 tests/etc/types/selectors/tmp/
 tests/reports/
 tests/tmp/
+tests/etc/tasks/ext/pdo/test.db
diff --git a/composer.json b/composer.json
@@ -100,6 +100,7 @@
         "pear/mail_mime": "^1.10",
         "pear/net_growl": "dev-master",
         "pear/pear-core-minimal": "^1.10.10",
+        "pear/versioncontrol_git": "dev-master",
         "phpunit/phpunit": "^9.4",
         "scssphp/scssphp": "~1.0",
         "squizlabs/php_codesniffer": "^3.5",
@@ -139,6 +140,6 @@
         "jawira/plantuml-encoding": "Required by VisualizerTask",
         "monolog/monolog": "Required by the MonologListener"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }
diff --git a/composer.lock b/composer.lock
diff --git a/etc/phing-grammar.rng b/etc/phing-grammar.rng
@@ -4908,6 +4908,12 @@
                         <data type="boolean"/>
                     </attribute>
                 </optional>
+                <optional>
+                    <attribute name="errorproperty"/>
+                </optional>
+                <optional>
+                    <attribute name="statementcountproperty"/>
+                </optional>
             </interleave>
             <zeroOrMore>
                 <ref name="fileset"/>

diff --git a/src/Phing/Io/BufferedReader.php b/src/Phing/Io/BufferedReader.php
@@ -41,12 +41,12 @@ class BufferedReader extends Reader
     private $in;
 
     /**
-     * @param InputStreamReader $reader   The reader (e.g. FileReader).
+     * @param Reader $reader   The reader (e.g. FileReader).
      * @param int               $buffsize The size of the buffer we should use for reading files.
      *                                    A large buffer ensures that most files (all scripts?)
      *                                    are parsed in 1 buffer.
      */
-    public function __construct(InputStreamReader $reader, $buffsize = 65536)
+    public function __construct(Reader $reader, $buffsize = 65536)
     {
         $this->in = $reader;
         $this->bufferSize = $buffsize;

diff --git a/src/Phing/Task/System/Pdo/DefaultPDOQuerySplitter.php b/src/Phing/Task/System/Pdo/DefaultPDOQuerySplitter.php
@@ -67,7 +67,7 @@ public function __construct(PDOSQLExecTask $parent, Reader $reader, $delimiterTy
      *
      * @return null|string
      */
-    public function nextQuery()
+    public function nextQuery(): ?string
     {
         $sql = '';
         $hasQuery = false;

diff --git a/src/Phing/Task/System/Pdo/DummyPDOQuerySplitter.php b/src/Phing/Task/System/Pdo/DummyPDOQuerySplitter.php
@@ -35,7 +35,7 @@ class DummyPDOQuerySplitter extends PDOQuerySplitter
      *
      * @return null|string
      */
-    public function nextQuery()
+    public function nextQuery(): ?string
     {
         $sql = null;
 

diff --git a/src/Phing/Task/System/Pdo/PDOQuerySplitter.php b/src/Phing/Task/System/Pdo/PDOQuerySplitter.php
@@ -58,5 +58,5 @@ public function __construct(PDOSQLExecTask $parent, Reader $reader)
      *
      * @return null|string
      */
-    abstract public function nextQuery();
+    abstract public function nextQuery(): ?string;
 }