Skip to content

Commit 99258f2

Browse files
author
Slavey Karadzhov
committed
Switched to stable php-cs-fixer version.
1 parent d6b9ea9 commit 99258f2

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

Diff for: ‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"require-dev" : {
3232
"phpunit/phpunit" : "4.1.*",
33-
"fabpot/php-cs-fixer": "dev-master",
33+
"fabpot/php-cs-fixer": "1.10.*",
3434
"zendframework/zendframework" : "~2.4.0",
3535
"satooshi/php-coveralls": "dev-master",
3636
"phpunit/phpcov": "2.0.*"

Diff for: ‎module/Client/config/composer/post_stage.php

+1
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@
2828
unlink(getenv('ZS_APPLICATION_BASE_DIR') . '/composer.json ');
2929
chdir($cwd);
3030
// End: AutoGenerated from @ZendServerClient
31+

Diff for: ‎module/Client/src/Client/Controller/ApiController.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function bootstrapSingleServerAction($args)
9595
$keyService = $this->getServiceLocator()->get('defaultApiKey');
9696
$keyService->setName($name);
9797
$keyService->setKey($key);
98-
$this->repeater()->doUntil(array($this,'onWaitBootstrapSingleServer'));
98+
$this->repeater()->doUntil(array($this, 'onWaitBootstrapSingleServer'));
9999
}
100100

101101
return $response;
@@ -106,7 +106,7 @@ public function serverAddToClusterAction($args)
106106
{
107107
// check if the cluster DB is up and ready to be used
108108
if ($this->params('wait-db')) {
109-
$this->repeater()->doUntil(array($this,'onWaitClusterDb'),
109+
$this->repeater()->doUntil(array($this, 'onWaitClusterDb'),
110110
array(
111111
'dbHost'=>$args['dbHost'],
112112
'dbUsername'=>$args['dbUsername'],
@@ -128,7 +128,7 @@ public function serverAddToClusterAction($args)
128128
$keyService->setName(sprintf("%s", $response->responseData->clusterAdminKey->name));
129129
$keyService->setKey(sprintf("%s", $response->responseData->clusterAdminKey->hash));
130130
$serverId = sprintf("%d", $response->responseData->serverInfo->id);
131-
$this->repeater()->doUntil(array($this,'onWaitServerAddToCluster'), array('serverId'=>$serverId));
131+
$this->repeater()->doUntil(array($this, 'onWaitServerAddToCluster'), array('serverId'=>$serverId));
132132
}
133133

134134
return $response;
@@ -147,7 +147,7 @@ public function clusterRemoveServerAction($args)
147147
$response = $this->sendApiRequest($args);
148148

149149
if ($wait) {
150-
$this->repeater()->doUntil(array($this,'onWaitClusterRemoveServer'),
150+
$this->repeater()->doUntil(array($this, 'onWaitClusterRemoveServer'),
151151
array(
152152
'serverCount'=> $serverCount
153153
));

Diff for: ‎module/Client/src/Client/Controller/AppController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function installAction()
8686
}
8787

8888
if ($wait) {
89-
$response = $this->repeater()->doUntil(array($this,'onWaitInstall'), array('appId'=>sprintf("%s", $appId)));
89+
$response = $this->repeater()->doUntil(array($this, 'onWaitInstall'), array('appId'=>sprintf("%s", $appId)));
9090
}
9191

9292
return $response;

Diff for: ‎module/Client/src/Client/Controller/PluginController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function installAction()
136136

137137
if ($wait) {
138138
$xml = new \SimpleXMLElement($response->getBody());
139-
$this->repeater()->doUntil(array($this,'onWaitInstall'),
139+
$this->repeater()->doUntil(array($this, 'onWaitInstall'),
140140
array('pluginId'=> (string)$xml->responseData->plugin->id)
141141
);
142142
}

Diff for: ‎module/Client/src/Client/Controller/TargetController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function addAction()
3131
}
3232

3333
$data[$target] = array();
34-
foreach (array('zsurl','zskey','zssecret', 'zsversion') as $key) {
34+
foreach (array('zsurl', 'zskey', 'zssecret', 'zsversion') as $key) {
3535
$value = $this->getRequest()->getParam($key);
3636
if ($value) {
3737
$data[$target][$key] = $value;
@@ -70,7 +70,7 @@ public function updateAction()
7070
throw new \Zend\Console\Exception\RuntimeException("Target '$target' does not exist!");
7171
}
7272

73-
foreach (array('zsurl','zskey','zssecret', 'zsversion') as $key) {
73+
foreach (array('zsurl', 'zskey', 'zssecret', 'zsversion') as $key) {
7474
$value = $this->getRequest()->getParam($key);
7575
if ($value) {
7676
$data[$target][$key] = $value;

Diff for: ‎module/Client/src/Client/Controller/ZpkController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function packAction()
169169
error_log('WARNING: If you have user parameters then you have to use --composer-dist-files to point to the YAML dist files.');
170170
} else {
171171
// Read the parameters from composer-dist-files are specified it gets the parameters from them and puts them as zpk parameters (with default values)
172-
$yaml = new YamlReader(array('Spyc','YAMLLoadString'));
172+
$yaml = new YamlReader(array('Spyc', 'YAMLLoadString'));
173173
foreach ($distFiles as $file) {
174174
$data = $yaml->fromFile($file);
175175
$userParams = array_merge($userParams, $data['parameters']);

Diff for: ‎module/Client/src/Client/Service/ZpkInvokable.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ protected function addPathToZpk($zpk, $sourceFolder, $localPath, $zpkPath,
499499
$entries = scandir($fullPath);
500500
// filter entries
501501
foreach ($entries as $idx => $name) {
502-
if (in_array($name, array('.','..'))) {
502+
if (in_array($name, array('.', '..'))) {
503503
unset($entries[$idx]);
504504
continue;
505505
}

Diff for: ‎module/Client/tests/ClientTest/Controller/ArgumentsControllerTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function testArrayParamAction()
7878
$routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
7979
$arrayParam = $routeMatch->getParam('arrayParam');
8080

81-
$this->assertEquals($arrayParam, array('x','y','z'));
81+
$this->assertEquals($arrayParam, array('x', 'y', 'z'));
8282
}
8383

8484
public function testArrayParamCustomDelimiterAction()
@@ -90,7 +90,7 @@ public function testArrayParamCustomDelimiterAction()
9090
$routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
9191
$arrayParam = $routeMatch->getParam('arrayParam');
9292

93-
$this->assertEquals($arrayParam, array('x','y','z'));
93+
$this->assertEquals($arrayParam, array('x', 'y', 'z'));
9494
}
9595

9696
public function testArrayAssocParamAction()
@@ -102,7 +102,7 @@ public function testArrayAssocParamAction()
102102
$routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
103103
$arrayParam = $routeMatch->getParam('arrayParam');
104104

105-
$this->assertEquals($arrayParam, array('x' => array('a'=>0, 'b'=>1 ),'y'=> 2));
105+
$this->assertEquals($arrayParam, array('x' => array('a'=>0, 'b'=>1 ), 'y'=> 2));
106106
}
107107

108108
public function testArrayAssocParamCustomDelimiterAction()
@@ -114,6 +114,6 @@ public function testArrayAssocParamCustomDelimiterAction()
114114
$routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
115115
$arrayParam = $routeMatch->getParam('arrayParam');
116116

117-
$this->assertEquals($arrayParam, array('x' => array('a'=>0, 'b'=>1 ),'y'=> 2));
117+
$this->assertEquals($arrayParam, array('x' => array('a'=>0, 'b'=>1 ), 'y'=> 2));
118118
}
119119
}

0 commit comments

Comments
 (0)