From 2eed8b76c70da55dd2baf9ba3a7b4aacc0ec298e Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Tue, 16 Aug 2022 11:45:46 -0700
Subject: [PATCH 1/2] Add php-cs-fixer files to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5a43536..085be3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 sdk
+.php-cs-fixer.php
+.php-cs-fixer.cache

From fe2af4434955eb5bcc1764cb8e9bf5281f806b2a Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Tue, 16 Aug 2022 11:45:46 -0700
Subject: [PATCH 2/2] Re-apply php-cs-fixer formatting

---
 src/DockerExecutorJavaServiceProvider.php | 18 ++++++++++--------
 src/Listeners/PackageListener.php         | 13 ++++++++-----
 src/ScriptRunners/JavaRunner.php          |  1 +
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/DockerExecutorJavaServiceProvider.php b/src/DockerExecutorJavaServiceProvider.php
index 0ad80d4..d32b45e 100644
--- a/src/DockerExecutorJavaServiceProvider.php
+++ b/src/DockerExecutorJavaServiceProvider.php
@@ -2,12 +2,12 @@
 
 namespace ProcessMaker\Package\DockerExecutorJava;
 
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\ServiceProvider;
 use ProcessMaker\Models\ScriptExecutor;
-use ProcessMaker\Package\Packages\Events\PackageEvent;
 use ProcessMaker\Package\DockerExecutorJava\Listeners\PackageListener;
+use ProcessMaker\Package\Packages\Events\PackageEvent;
 use ProcessMaker\Traits\PluginServiceProviderTrait;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\ServiceProvider;
 
 class DockerExecutorJavaServiceProvider extends ServiceProvider
 {
@@ -15,7 +15,9 @@ class DockerExecutorJavaServiceProvider extends ServiceProvider
 
     const version = '1.0.0'; // Required for PluginServiceProviderTrait
 
-    public function register() {}
+    public function register()
+    {
+    }
 
     /**
      * After all service provider's register methods have been called, your boot method
@@ -48,12 +50,12 @@ public function boot()
             'package_version' => self::version,
             'runner' => 'JavaRunner',
             'options' => [
-                'invokerPackage' => "ProcessMaker_Client",
-                'modelPackage' => "ProcessMaker_Model",
-                'apiPackage' => "ProcessMaker_Api",
+                'invokerPackage' => 'ProcessMaker_Client',
+                'modelPackage' => 'ProcessMaker_Model',
+                'apiPackage' => 'ProcessMaker_Api',
             ],
             'init_dockerfile' => [
-                "ARG SDK_DIR",
+                'ARG SDK_DIR',
                 'COPY $SDK_DIR /opt/executor/sdk-java',
                 'WORKDIR /opt/executor/sdk-java',
                 'RUN mvn clean install',
diff --git a/src/Listeners/PackageListener.php b/src/Listeners/PackageListener.php
index 48edc1c..31c523f 100644
--- a/src/Listeners/PackageListener.php
+++ b/src/Listeners/PackageListener.php
@@ -15,20 +15,23 @@ class PackageListener
      * @param PackageEvent $event
      * @return mixed
      */
-    public function handle(PackageEvent $event){
+    public function handle(PackageEvent $event)
+    {
         $composer = json_decode(file_get_contents(__DIR__ . '/../../composer.json'), true);
         $expires_on = null;
-        if(in_array('ionCube Loader', get_loaded_extensions()) && ioncube_file_info())
-            $expires_on = Carbon::createFromTimestamp(ioncube_file_info()['FILE_EXPIRY'], config('app.timezone'))->format(DateTime::ISO8601);           
-        
+        if (in_array('ionCube Loader', get_loaded_extensions()) && ioncube_file_info()) {
+            $expires_on = Carbon::createFromTimestamp(ioncube_file_info()['FILE_EXPIRY'], config('app.timezone'))->format(DateTime::ISO8601);
+        }
+
         $infoPackage = [
             'name' => $composer['name'],
             'friendly_name' => isset($composer['friendly_name']) ? $composer['friendly_name'] : '',
             'description' => $composer['description'],
             'version' => $composer['version'],
-            'expires_on' => $expires_on
+            'expires_on' => $expires_on,
         ];
         $event->packages->push($infoPackage);
+
         return $event->packages->last();
     }
 }
diff --git a/src/ScriptRunners/JavaRunner.php b/src/ScriptRunners/JavaRunner.php
index 1f934c9..d479905 100644
--- a/src/ScriptRunners/JavaRunner.php
+++ b/src/ScriptRunners/JavaRunner.php
@@ -17,6 +17,7 @@ public function config($code, array $dockerConfig)
         $dockerConfig['image'] = config('script-runners.java.image');
         $dockerConfig['command'] = '/bin/sh /opt/executor/run.sh';
         $dockerConfig['inputs']['/opt/executor/Script.java'] = $code;
+
         return $dockerConfig;
     }
 }