Merge branch 'master' into malhusseiny

phingofficial · Jan 26, 2021 · 72f4ebf · 72f4ebf
2 parents 53c80dc + 9e21c49
commit 72f4ebf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,9 +33,12 @@ jobs:
         with:
           dependency-versions: 'locked'
 
-      - name: Static Code Analysis
+      - name: Code style
         run: bin/phpcs -s -n --standard=./ruleset.xml classes src tests/classes tests/Phing
 
+      - name: Static analysis (level 1)
+        run: bin/phpstan
+
   test:
     needs:
       - pre_job

diff --git a/classes/phing/tasks/ext/Service/Amazon/S3.php b/classes/phing/tasks/ext/Service/Amazon/S3.php
@@ -112,17 +112,6 @@ public function getObjectInstance($object)
         return $this->getClientInstance()->getObject($object);
     }
 
-    /**
-     * Check if the object already exists in the current bucket
-     *
-     * @param  mixed $object
-     * @return bool
-     */
-    public function isObjectAvailable($object)
-    {
-        return (bool) $this->getObjectInstance($object)->load(Services_Amazon_S3_Resource_Object::LOAD_METADATA_ONLY);
-    }
-
     /**
      * Returns an instance of Services_Amazon_S3_Resource_Bucket
      *

diff --git a/classes/phing/tasks/ext/VersionTask.php b/classes/phing/tasks/ext/VersionTask.php
@@ -135,6 +135,8 @@ public function setPropFile($isPropFile)
      */
     public function main()
     {
+        $properties = null;
+
         // check supplied attributes
         $this->checkReleasetype();
         $this->checkFile();

diff --git a/classes/phing/tasks/ext/visualizer/VisualizerTask.php b/classes/phing/tasks/ext/visualizer/VisualizerTask.php
@@ -67,7 +67,7 @@ class VisualizerTask extends HttpTask
     public function init(): void
     {
         parent::init();
-        if (!function_exists(\Jawira\PlantUml\encodep::class)) {
+        if (!function_exists('\Jawira\PlantUml\encodep')) {
             $exceptionMessage = get_class($this) . ' requires "jawira/plantuml-encoding" library';
         }
         if (!class_exists(XSLTProcessor::class)) {

diff --git a/phpstan.neon b/phpstan.neon
@@ -7,3 +7,4 @@ parameters:
         - tests/Phing
     bootstrapFiles:
         - tests/bootstrap.php
+        - vendor/pear/versioncontrol_svn/VersionControl/SVN.php