Move pdo tasks and path-as-package task to system scope (#1521)

etc/default.tasks.properties

@@ -81,14 +81,14 @@ propertyselector=Phing\Task\System\Property\PropertySelector
 urlencode=Phing\Task\System\Property\URLEncodeTask
 var=Phing\Task\System\Property\Variable
 sortlist=Phing\Task\System\Property\SortList
+pdo=Phing\Task\System\Pdo\PDOSQLExecTask
+pdosqlexec=Phing\Task\System\Pdo\PDOSQLExecTask
 pharpackage=Phing\Task\System\PharPackageTask
 phardata=Phing\Task\System\PharDataTask
 xmlproperty=Phing\Task\System\XmlPropertyTask
+package-as-path=Phing\Task\System\PackageAsPathTask
 
 ; "ext" tasks
-pdo=phing.tasks.ext.pdo.PDOSQLExecTask
-pdosqlexec=phing.tasks.ext.pdo.PDOSQLExecTask
-package-as-path=phing.tasks.ext.PackageAsPathTask
 mail=phing.tasks.ext.MailTask
 phpunit=phing.tasks.ext.phpunit.PHPUnitTask
 phpunitreport=phing.tasks.ext.phpunit.PHPUnitReportTask

src/Phing/Task/System/Condition/ConditionBase.php

@@ -20,7 +20,7 @@
 namespace Phing\Task\System\Condition;
 
 use IteratorAggregate;
-use PDOSQLExecTask;
+use Phing\Task\System\Pdo\PDOSQLExecTask;
 use Phing\Exception\BuildException;
 use Phing\Parser\CustomChildCreator;
 use Phing\Project;

classes/phing/tasks/ext/PackageAsPathTask.php → src/Phing/Task/System/PackageAsPathTask.php

@@ -17,6 +17,8 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System;
+
 use Phing\Task;
 
 /**

classes/phing/tasks/ext/pdo/DefaultPDOQuerySplitter.php → src/Phing/Task/System/Pdo/DefaultPDOQuerySplitter.php

@@ -19,6 +19,8 @@
  * @package phing.tasks.ext.pdo
  */
 
+namespace Phing\Task\System\Pdo;
+
 use Phing\Io\Reader;
 use Phing\Util\StringHelper;
 
@@ -90,7 +92,7 @@ public function nextQuery()
 
             if (
                 strlen($line) > 4
-                && strtoupper(substr($line, 0, 4)) == "REM "
+                && strtoupper(substr($line, 0, 4)) === "REM "
             ) {
                 continue;
             }

classes/phing/tasks/ext/pdo/DummyPDOQuerySplitter.php → src/Phing/Task/System/Pdo/DummyPDOQuerySplitter.php

@@ -19,6 +19,8 @@
  * @package phing.tasks.ext.pdo
  */
 
+namespace Phing\Task\System\Pdo;
+
 use Phing\Util\StringHelper;
 
 /**

classes/phing/tasks/ext/pdo/PDOQuerySplitter.php → src/Phing/Task/System/Pdo/PDOQuerySplitter.php

@@ -19,6 +19,8 @@
  * @package phing.tasks.ext.pdo
  */
 
+namespace Phing\Task\System\Pdo;
+
 use Phing\Io\BufferedReader;
 use Phing\Io\Reader;
 

classes/phing/tasks/ext/pdo/PDOResultFormatter.php → src/Phing/Task/System/Pdo/PDOResultFormatter.php

@@ -17,6 +17,8 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System\Pdo;
+
 use Phing\Io\Writer;
 
 /**

classes/phing/tasks/ext/pdo/PDOSQLExecFormatterElement.php → src/Phing/Task/System/Pdo/PDOSQLExecFormatterElement.php

@@ -17,6 +17,8 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System\Pdo;
+
 use Phing\Exception\BuildException;
 use Phing\Io\FileWriter;
 use Phing\Io\LogWriter;
@@ -222,9 +224,9 @@ public function prepare(Location $location)
     public function setType($type)
     {
         $this->type = $type;
-        if ($this->type == "xml") {
+        if ($this->type === "xml") {
             $this->formatter = new XMLPDOResultFormatter();
-        } elseif ($this->type == "plain") {
+        } elseif ($this->type === "plain") {
             $this->formatter = new PlainPDOResultFormatter();
         } else {
             throw new BuildException("Formatter '" . $this->type . "' not implemented");

classes/phing/tasks/ext/pdo/PDOSQLExecTask.php → src/Phing/Task/System/Pdo/PDOSQLExecTask.php

@@ -17,6 +17,12 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System\Pdo;
+
+use Exception;
+use PDO;
+use PDOException;
+use PDOStatement;
 use Phing\Exception\BuildException;
 use Phing\Io\IOException;
 use Phing\Io\LogWriter;
@@ -420,7 +426,7 @@ public function main()
                     throw $e;
                 }
             } catch (IOException $e) {
-                if (!$this->isAutocommit() && $this->conn !== null && $this->onError == "abort") {
+                if (!$this->isAutocommit() && $this->conn !== null && $this->onError === "abort") {
                     try {
                         $this->conn->rollback();
                     } catch (PDOException $ex) {
@@ -429,7 +435,7 @@ public function main()
                 $this->closeConnection();
                 throw new BuildException($e->getMessage(), $this->getLocation());
             } catch (PDOException $e) {
-                if (!$this->isAutocommit() && $this->conn !== null && $this->onError == "abort") {
+                if (!$this->isAutocommit() && $this->conn !== null && $this->onError === "abort") {
                     try {
                         $this->conn->rollback();
                     } catch (PDOException $ex) {

classes/phing/tasks/ext/pdo/PDOSQLExecTransaction.php → src/Phing/Task/System/Pdo/PDOSQLExecTransaction.php

@@ -17,6 +17,8 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System\Pdo;
+
 use Phing\Io\FileReader;
 use Phing\Io\IOException;
 use Phing\Io\File;

classes/phing/tasks/ext/pdo/PDOTask.php → src/Phing/Task/System/Pdo/PDOTask.php

@@ -17,6 +17,11 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System\Pdo;
+
+use Exception;
+use PDO;
+use PDOException;
 use Phing\Exception\BuildException;
 use Phing\Project;
 use Phing\Task;
@@ -116,7 +121,8 @@ public function setAutocommit($autocommit)
      * The calling method is responsible for closing the connection.
      *
      * @return PDO     the newly created connection.
-     * @throws BuildException if the UserId/Password/Url is not set or there is no suitable driver or the driver fails to load.
+     * @throws BuildException if the UserId/Password/Url is not set or there is no suitable driver
+     *                        or the driver fails to load.
      */
     protected function getConnection()
     {

classes/phing/tasks/ext/pdo/PgsqlPDOQuerySplitter.php → src/Phing/Task/System/Pdo/PgsqlPDOQuerySplitter.php

@@ -19,6 +19,8 @@
  * @package phing.tasks.ext.pdo
  */
 
+namespace Phing\Task\System\Pdo;
+
 /**
  * Splits PostgreSQL's dialect of SQL into separate queries
  *
@@ -125,12 +127,12 @@ public function ungetc()
     protected function checkDollarQuote()
     {
         $ch = $this->getc();
-        if ('$' == $ch) {
+        if ('$' === $ch) {
             // empty tag
             return '';
         }
 
-        if (!ctype_alpha($ch) && '_' != $ch) {
+        if (!ctype_alpha($ch) && '_' !== $ch) {
             // not a delimiter
             $this->ungetc();
 
@@ -139,11 +141,11 @@ protected function checkDollarQuote()
 
         $tag = $ch;
         while (false !== ($ch = $this->getc())) {
-            if ('$' == $ch) {
+            if ('$' === $ch) {
                 return $tag;
             }
 
-            if (ctype_alnum($ch) || '_' == $ch) {
+            if (ctype_alnum($ch) || '_' === $ch) {
                 $tag .= $ch;
             } else {
                 for ($i = 0, $tagLength = strlen($tag); $i < $tagLength; $i++) {
@@ -182,7 +184,7 @@ public function nextQuery()
                             $this->state = self::STATE_SINGLE_QUOTED;
                             break;
                         case '/':
-                            if ('*' == $this->getc()) {
+                            if ('*' === $this->getc()) {
                                 $this->state = self::STATE_COMMENT_MULTILINE;
                                 $this->commentDepth = 1;
                             } else {
@@ -207,7 +209,7 @@ public function nextQuery()
                         case $delimiter[0]:
                             // special case to allow "create rule" statements
                             // http://www.postgresql.org/docs/current/interactive/sql-createrule.html
-                            if (';' == $delimiter && 0 < $openParens) {
+                            if (';' === $delimiter && 0 < $openParens) {
                                 break;
                             }
                             $hasQuery = true;
@@ -227,7 +229,7 @@ public function nextQuery()
                     break;
 
                 case self::STATE_COMMENT_LINEEND:
-                    if ("\n" == $ch) {
+                    if ("\n" === $ch) {
                         $this->state = self::STATE_NORMAL;
                     }
                     break;

classes/phing/tasks/ext/pdo/PlainPDOResultFormatter.php → src/Phing/Task/System/Pdo/PlainPDOResultFormatter.php

@@ -17,6 +17,8 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System\Pdo;
+
 use Phing\Io\File;
 use Phing\Util\StringHelper;
 

classes/phing/tasks/ext/pdo/XMLPDOResultFormatter.php → src/Phing/Task/System/Pdo/XMLPDOResultFormatter.php

@@ -17,6 +17,10 @@
  * <http://phing.info>.
  */
 
+namespace Phing\Task\System\Pdo;
+
+use DOMDocument;
+use DOMElement;
 use Phing\Io\File;
 
 /**

tests/Phing/Task/Optional/PDODelimitersTest.php

@@ -20,7 +20,7 @@
 
 namespace Phing\Task\Optional;
 
-use PDOSQLExecTask;
+use Phing\Task\System\Pdo\PDOSQLExecTask;
 use Phing\Io\File;
 use Phing\Support\BuildFileTest;
 
@@ -38,7 +38,7 @@ public function setUp(): void
         $this->configureProject(PHING_TEST_BASE . "/etc/tasks/ext/pdo/empty.xml");
         $this->queries = [];
 
-        $this->mockTask = $this->getMockBuilder('PDOSQLExecTask')
+        $this->mockTask = $this->getMockBuilder(PDOSQLExecTask::class)
             ->setMethods(['getConnection', 'execSQL'])
             ->getMock();
         $this->mockTask->setProject($this->project);