Skip to content

Commit 4701abe

Browse files
authored
Merge pull request #4 from ProcessMaker/feature/FOUR-6588
Applying php-cs-fixer formatting
2 parents 471acc6 + fe2af44 commit 4701abe

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
sdk
2+
.php-cs-fixer.php
3+
.php-cs-fixer.cache

src/DockerExecutorJavaServiceProvider.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22

33
namespace ProcessMaker\Package\DockerExecutorJava;
44

5+
use Illuminate\Support\Facades\Artisan;
6+
use Illuminate\Support\ServiceProvider;
57
use ProcessMaker\Models\ScriptExecutor;
6-
use ProcessMaker\Package\Packages\Events\PackageEvent;
78
use ProcessMaker\Package\DockerExecutorJava\Listeners\PackageListener;
9+
use ProcessMaker\Package\Packages\Events\PackageEvent;
810
use ProcessMaker\Traits\PluginServiceProviderTrait;
9-
use Illuminate\Support\Facades\Artisan;
10-
use Illuminate\Support\ServiceProvider;
1111

1212
class DockerExecutorJavaServiceProvider extends ServiceProvider
1313
{
1414
use PluginServiceProviderTrait;
1515

1616
const version = '1.0.0'; // Required for PluginServiceProviderTrait
1717

18-
public function register() {}
18+
public function register()
19+
{
20+
}
1921

2022
/**
2123
* After all service provider's register methods have been called, your boot method
@@ -48,12 +50,12 @@ public function boot()
4850
'package_version' => self::version,
4951
'runner' => 'JavaRunner',
5052
'options' => [
51-
'invokerPackage' => "ProcessMaker_Client",
52-
'modelPackage' => "ProcessMaker_Model",
53-
'apiPackage' => "ProcessMaker_Api",
53+
'invokerPackage' => 'ProcessMaker_Client',
54+
'modelPackage' => 'ProcessMaker_Model',
55+
'apiPackage' => 'ProcessMaker_Api',
5456
],
5557
'init_dockerfile' => [
56-
"ARG SDK_DIR",
58+
'ARG SDK_DIR',
5759
'COPY $SDK_DIR /opt/executor/sdk-java',
5860
'WORKDIR /opt/executor/sdk-java',
5961
'RUN mvn clean install',

src/Listeners/PackageListener.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,23 @@ class PackageListener
1515
* @param PackageEvent $event
1616
* @return mixed
1717
*/
18-
public function handle(PackageEvent $event){
18+
public function handle(PackageEvent $event)
19+
{
1920
$composer = json_decode(file_get_contents(__DIR__ . '/../../composer.json'), true);
2021
$expires_on = null;
21-
if(in_array('ionCube Loader', get_loaded_extensions()) && ioncube_file_info())
22-
$expires_on = Carbon::createFromTimestamp(ioncube_file_info()['FILE_EXPIRY'], config('app.timezone'))->format(DateTime::ISO8601);
23-
22+
if (in_array('ionCube Loader', get_loaded_extensions()) && ioncube_file_info()) {
23+
$expires_on = Carbon::createFromTimestamp(ioncube_file_info()['FILE_EXPIRY'], config('app.timezone'))->format(DateTime::ISO8601);
24+
}
25+
2426
$infoPackage = [
2527
'name' => $composer['name'],
2628
'friendly_name' => isset($composer['friendly_name']) ? $composer['friendly_name'] : '',
2729
'description' => $composer['description'],
2830
'version' => $composer['version'],
29-
'expires_on' => $expires_on
31+
'expires_on' => $expires_on,
3032
];
3133
$event->packages->push($infoPackage);
34+
3235
return $event->packages->last();
3336
}
3437
}

src/ScriptRunners/JavaRunner.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public function config($code, array $dockerConfig)
1717
$dockerConfig['image'] = config('script-runners.java.image');
1818
$dockerConfig['command'] = '/bin/sh /opt/executor/run.sh';
1919
$dockerConfig['inputs']['/opt/executor/Script.java'] = $code;
20+
2021
return $dockerConfig;
2122
}
2223
}

0 commit comments

Comments
 (0)