@@ -13,49 +13,58 @@ class Application
13
13
14
14
/**
15
15
* Run the application
16
+ * @return int Return code
16
17
*/
17
18
public function run ()
18
19
{
19
20
if (in_array ('proc_open ' , explode (', ' , ini_get ('disable_functions ' )))) {
20
21
echo "Function 'proc_open' is required, but it is disabled by disable_functions setting. " , PHP_EOL ;
21
- die ( self ::FAILED ) ;
22
+ return self ::FAILED ;
22
23
}
24
+
23
25
if (in_array ('-h ' , $ _SERVER ['argv ' ]) || in_array ('--help ' , $ _SERVER ['argv ' ])) {
24
26
$ this ->showUsage ();
27
+ return self ::SUCCESS ;
25
28
}
29
+
26
30
if (in_array ('-V ' , $ _SERVER ['argv ' ]) || in_array ('--version ' , $ _SERVER ['argv ' ])) {
27
31
$ this ->showVersion ();
28
- die () ;
32
+ return self :: SUCCESS ;
29
33
}
34
+
30
35
try {
31
36
$ settings = Settings::parseArguments ($ _SERVER ['argv ' ]);
32
37
if ($ settings ->stdin ) {
33
38
$ settings ->addPaths (Settings::getPathsFromStdIn ());
34
39
}
35
40
if (empty ($ settings ->paths )) {
36
41
$ this ->showUsage ();
42
+ return self ::FAILED ;
37
43
}
38
44
$ manager = new Manager ;
39
45
$ result = $ manager ->run ($ settings );
40
46
if ($ settings ->ignoreFails ) {
41
- die ( $ result ->hasSyntaxError () ? self ::WITH_ERRORS : self ::SUCCESS ) ;
47
+ return $ result ->hasSyntaxError () ? self ::WITH_ERRORS : self ::SUCCESS ;
42
48
} else {
43
- die ( $ result ->hasError () ? self ::WITH_ERRORS : self ::SUCCESS ) ;
49
+ return $ result ->hasError () ? self ::WITH_ERRORS : self ::SUCCESS ;
44
50
}
51
+
45
52
} catch (InvalidArgumentException $ e ) {
46
53
echo "Invalid option {$ e ->getArgument ()}" , PHP_EOL , PHP_EOL ;
47
54
$ this ->showOptions ();
48
- die (self ::FAILED );
55
+ return self ::FAILED ;
56
+
49
57
} catch (Exception $ e ) {
50
58
if (isset ($ settings ) && $ settings ->format === Settings::FORMAT_JSON ) {
51
59
echo json_encode ($ e );
52
60
} else {
53
61
echo $ e ->getMessage (), PHP_EOL ;
54
62
}
55
- die (self ::FAILED );
56
- } catch (Exception $ e ) {
63
+ return self ::FAILED ;
64
+
65
+ } catch (\Exception $ e ) {
57
66
echo $ e ->getMessage (), PHP_EOL ;
58
- die ( self ::FAILED ) ;
67
+ return self ::FAILED ;
59
68
}
60
69
}
61
70
@@ -110,6 +119,5 @@ private function showUsage()
110
119
111
120
USAGE ;
112
121
$ this ->showOptions ();
113
- die ();
114
122
}
115
123
}
0 commit comments