Skip to content

Commit fb08a05

Browse files
committed
Merge branch '1.1'
2 parents 82be028 + 31a3e89 commit fb08a05

File tree

7 files changed

+22
-7
lines changed

7 files changed

+22
-7
lines changed

.gitignore

100644100755
File mode changed.

DeployApplication.php

100644100755
File mode changed.

README.md

100644100755
File mode changed.

composer.json

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"extra": {
3131
"branch-alias": {
32-
"dev-master": "1.2.x-dev"
32+
"dev-master": "1.1.x-dev"
3333
}
3434
},
3535
"require": {}

run-tests.sh

100644100755
File mode changed.

shell_lib.php

100644100755
Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,15 @@
1919
* 'ls'
2020
* ]);
2121
* ```
22-
* @deprecated
22+
* @deprecated will be deleted in v1.2
2323
*/
2424
class ShellHelper
2525
{
26+
/**
27+
* @param array $commands
28+
* @return string
29+
* @deprecated
30+
*/
2631
public static function exec(array $commands)
2732
{
2833
$res = "Executing shell commands:\n";
@@ -41,18 +46,20 @@ public static function exec(array $commands)
4146
/**
4247
* Returning an absolute path to "php". It is useful, cause just "php" not working!
4348
* @return string
49+
* @deprecated
4450
*/
4551
public static function php()
4652
{
4753
if (defined('PHP_BINDIR') && PHP_BINDIR) {
4854
return PHP_BINDIR . '/php';
49-
} else if (defined('PHP_BINARY') && PHP_BINARY) {
55+
}
56+
if (defined('PHP_BINARY') && PHP_BINARY) {
5057
return PHP_BINARY . '/php';
51-
} else if (defined('PHP_BINDER') && PHP_BINDER) {
58+
}
59+
if (defined('PHP_BINDER') && PHP_BINDER) {
5260
return PHP_BINDER . '/php';
53-
} else {
54-
return 'php';
5561
}
62+
return 'php';
5663
}
5764
}
5865

@@ -65,17 +72,25 @@ public static function php()
6572
* LogHelper::init('log_file.txt');
6673
* LogHelper::log('message for logging');
6774
* ```
68-
* @deprecated
75+
* @deprecated will be deleted in v1.2
6976
*/
7077
class LogHelper
7178
{
7279
public static $log_file;
7380

81+
/**
82+
* @param $log_file
83+
* @deprecated
84+
*/
7485
public static function init($log_file)
7586
{
7687
static::$log_file = $log_file;
7788
}
7889

90+
/**
91+
* @param $message
92+
* @deprecated
93+
*/
7994
public static function log($message)
8095
{
8196
if (empty(static::$log_file)) {

tests/DeployApplicationTest.php

100644100755
File mode changed.

0 commit comments

Comments
 (0)