Test using personal access token

phing-ci · phing-ci · commit b647a0d7b953 · 2023-04-02T03:48:28.000Z
diff --git a/SvnBaseTask.php b/SvnBaseTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Exception;
 use Phing\Exception\BuildException;
@@ -367,7 +368,7 @@ protected function setup($mode)
      * @throws   BuildException
      * @internal param Additional $array arguments to pass to SVN.
      * @internal param Switches $array to pass to SVN.
-     * @return   string Output generated by SVN.
+     * @return   array Output generated by SVN.
      */
     protected function run($args = [], $switches = [])
     {
@@ -398,5 +399,7 @@ protected function run($args = [], $switches = [])
                 throw new BuildException("Failed to run the 'svn " . $this->mode . "' command: " . $e->getMessage());
             }
         }
+
+        return [];
     }
 }
diff --git a/SvnCheckoutTask.php b/SvnCheckoutTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnCommitTask.php b/SvnCommitTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnCopyTask.php b/SvnCopyTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnExportTask.php b/SvnExportTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnInfoTask.php b/SvnInfoTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnLastRevisionTask.php b/SvnLastRevisionTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnListTask.php b/SvnListTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 use VersionControl_SVN;
diff --git a/SvnLogTask.php b/SvnLogTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnPropgetTask.php b/SvnPropgetTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnProplistTask.php b/SvnProplistTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnPropsetTask.php b/SvnPropsetTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnRevertTask.php b/SvnRevertTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnSwitchTask.php b/SvnSwitchTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/SvnUpdateTask.php b/SvnUpdateTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Tasks\Ext;
+namespace Phing\Task\Ext\Svn;
 
 use Phing\Exception\BuildException;
 
diff --git a/composer.json b/composer.json
@@ -20,25 +20,25 @@
   },
   "autoload": {
     "psr-4": {
-      "Phing\\Tasks\\Ext\\": "src/"
+      "Phing\\Task\\Ext\\Svn\\": ""
     }
   },
   "extra": {
     "phing-custom-taskdefs": {
-      "svnlastrevision": "Phing\\Tasks\\Ext\\SvnLastRevisionTask",
-      "svncheckout": "Phing\\Tasks\\Ext\\SvnCheckoutTask",
-      "svnexport": "Phing\\Tasks\\Ext\\SvnExportTask",
-      "svnupdate": "Phing\\Tasks\\Ext\\SvnUpdateTask",
-      "svnswitch": "Phing\\Tasks\\Ext\\SvnSwitchTask",
-      "svncopy": "Phing\\Tasks\\Ext\\SvnCopyTask",
-      "svncommit": "Phing\\Tasks\\Ext\\SvnCommitTask",
-      "svnlist": "Phing\\Tasks\\Ext\\SvnListTask",
-      "svnlog": "Phing\\Tasks\\Ext\\SvnLogTask",
-      "svninfo": "Phing\\Tasks\\Ext\\SvnInfoTask",
-      "svnproplist": "Phing\\Tasks\\Ext\\SvnProplistTask",
-      "svnpropget": "Phing\\Tasks\\Ext\\SvnPropgetTask",
-      "svnpropset": "Phing\\Tasks\\Ext\\SvnPropsetTask",
-      "svnrevert": "Phing\\Tasks\\Ext\\SvnRevertTask"
+      "svnlastrevision": "Phing\\Task\\Ext\\SvnLastRevisionTask",
+      "svncheckout": "Phing\\Task\\Ext\\SvnCheckoutTask",
+      "svnexport": "Phing\\Task\\Ext\\SvnExportTask",
+      "svnupdate": "Phing\\Task\\Ext\\SvnUpdateTask",
+      "svnswitch": "Phing\\Task\\Ext\\SvnSwitchTask",
+      "svncopy": "Phing\\Task\\Ext\\SvnCopyTask",
+      "svncommit": "Phing\\Task\\Ext\\SvnCommitTask",
+      "svnlist": "Phing\\Task\\Ext\\SvnListTask",
+      "svnlog": "Phing\\Task\\Ext\\SvnLogTask",
+      "svninfo": "Phing\\Task\\Ext\\SvnInfoTask",
+      "svnproplist": "Phing\\Task\\Ext\\SvnProplistTask",
+      "svnpropget": "Phing\\Task\\Ext\\SvnPropgetTask",
+      "svnpropset": "Phing\\Task\\Ext\\SvnPropsetTask",
+      "svnrevert": "Phing\\Task\\Ext\\SvnRevertTask"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/**`
`3`	`4`	`* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS`
`4`	`5`	`* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT`
`@@ -17,7 +18,7 @@`
`17`	`18`	`* <http://phing.info>.`
`18`	`19`	`*/`
`19`	`20`
`20`		`-namespace Phing\Tasks\Ext;`
	`21`	`+namespace Phing\Task\Ext\Svn;`
`21`	`22`
`22`	`23`	`use Exception;`
`23`	`24`	`use Phing\Exception\BuildException;`
`@@ -367,7 +368,7 @@ protected function setup($mode)`
`367`	`368`	`* @throws BuildException`
`368`	`369`	`* @internal param Additional $array arguments to pass to SVN.`
`369`	`370`	`* @internal param Switches $array to pass to SVN.`
`370`		`- * @return string Output generated by SVN.`
	`371`	`+ * @return array Output generated by SVN.`
`371`	`372`	`*/`
`372`	`373`	`protected function run($args = [], $switches = [])`
`373`	`374`	`{`
`@@ -398,5 +399,7 @@ protected function run($args = [], $switches = [])`
`398`	`399`	`throw new BuildException("Failed to run the 'svn " . $this->mode . "' command: " . $e->getMessage());`
`399`	`400`	`}`
`400`	`401`	`}`
	`402`	`+`
	`403`	`+ return [];`
`401`	`404`	`}`
`402`	`405`	`}`