Merge pull request #58 from utopia-php/revert-cli-version

Revert: CLI version
utopia-php · Nov 26, 2024 · 1feea59 · 1feea59
2 parents 6a422ef + 4b0ea79
commit 1feea59
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 135 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     },
     "require": {
         "php": ">=8.0",
-        "utopia-php/cli": "0.19.*"
+        "utopia-php/cli": "0.16.*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3",

diff --git a/composer.lock b/composer.lock
diff --git a/pint.json b/pint.json
@@ -0,0 +1,18 @@
+{
+    "preset": "psr12",
+    "exclude": [
+    ],
+    "rules": {
+        "array_indentation": true,
+        "single_import_per_statement": true,
+        "simplified_null_return": true,
+        "ordered_imports": {
+            "sort_algorithm": "alpha",
+            "imports_order": [
+                "const",
+                "class",
+                "function"
+            ]
+        }
+    }
+}
diff --git a/src/Orchestration/Adapter.php b/src/Orchestration/Adapter.php
@@ -117,7 +117,8 @@ abstract public function run(
         string $hostname = '',
         bool $remove = false,
         string $network = '',
-        string $restart = self::RESTART_NO): string;
+        string $restart = self::RESTART_NO
+    ): string;
 
     /**
      * Execute Container

diff --git a/src/Orchestration/Adapter/DockerAPI.php b/src/Orchestration/Adapter/DockerAPI.php
@@ -445,7 +445,7 @@ public function list(array $filters = []): array
 
         $body = [
             'all' => true,
-            'filters' => empty($filtersSorted) ? new stdClass : json_encode($filtersSorted),
+            'filters' => empty($filtersSorted) ? new stdClass() : json_encode($filtersSorted),
         ];
 
         $result = $this->call('http://localhost/containers/json'.'?'.\http_build_query($body), 'GET');

diff --git a/src/Orchestration/Adapter/DockerCLI.php b/src/Orchestration/Adapter/DockerCLI.php
@@ -306,7 +306,8 @@ public function list(array $filters = []): array
      * @param  array<string, string>  $vars
      * @param  array<string, string>  $labels
      */
-    public function run(string $image,
+    public function run(
+        string $image,
         string $name,
         array $command = [],
         string $entrypoint = '',

diff --git a/src/Orchestration/Exception/Orchestration.php b/src/Orchestration/Exception/Orchestration.php
@@ -2,4 +2,6 @@
 
 namespace Utopia\Orchestration\Exception;
 
-class Orchestration extends \Exception {}
+class Orchestration extends \Exception
+{
+}
diff --git a/src/Orchestration/Exception/Timeout.php b/src/Orchestration/Exception/Timeout.php
@@ -2,4 +2,6 @@
 
 namespace Utopia\Orchestration\Exception;
 
-class Timeout extends \Exception {}
+class Timeout extends \Exception
+{
+}
diff --git a/tests/Orchestration/Adapter/DockerAPITest.php b/tests/Orchestration/Adapter/DockerAPITest.php
@@ -27,7 +27,7 @@ public static function getOrchestration(): Orchestration
             return self::$orchestration;
         }
 
-        $orchestration = new Orchestration(new DockerAPI);
+        $orchestration = new Orchestration(new DockerAPI());
 
         return self::$orchestration = $orchestration;
     }

diff --git a/tests/Orchestration/Adapter/DockerCLITest.php b/tests/Orchestration/Adapter/DockerCLITest.php
@@ -27,7 +27,7 @@ public static function getOrchestration(): Orchestration
             return self::$orchestration;
         }
 
-        $orchestration = new Orchestration(new DockerCLI);
+        $orchestration = new Orchestration(new DockerCLI());
 
         return self::$orchestration = $orchestration;
     }