projects
/
pharext
/
pharext
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
s/CliCommand/Cli\Command/g
[pharext/pharext]
/
src
/
pharext
/
Packager.php
diff --git
a/src/pharext/Packager.php
b/src/pharext/Packager.php
index 10542e489a74611366a2033e9e0600e8afad71fa..87d5baed8da4aeef3a5e60d762e87cf4ccdb1287 100644
(file)
--- a/
src/pharext/Packager.php
+++ b/
src/pharext/Packager.php
@@
-3,8
+3,6
@@
namespace pharext;
use Phar;
namespace pharext;
use Phar;
-use pharext\Cli\Args as CliArgs;
-use pharext\Cli\Command as CliCommand;
use pharext\Exception;
/**
use pharext\Exception;
/**
@@
-12,7
+10,7
@@
use pharext\Exception;
*/
class Packager implements Command
{
*/
class Packager implements Command
{
- use CliCommand;
+ use Cli
\
Command;
/**
* Extension source directory
/**
* Extension source directory
@@
-30,42
+28,42
@@
class Packager implements Command
* Create the command
*/
public function __construct() {
* Create the command
*/
public function __construct() {
- $this->args = new CliArgs([
+ $this->args = new Cli
\
Args([
["h", "help", "Display this help",
["h", "help", "Display this help",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|Cli
Args::HALT],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\
Args::HALT],
["v", "verbose", "More output",
["v", "verbose", "More output",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::NOARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::NOARG],
["q", "quiet", "Less output",
["q", "quiet", "Less output",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::NOARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::NOARG],
["n", "name", "Extension name",
["n", "name", "Extension name",
- Cli
Args::REQUIRED|CliArgs::SINGLE|Cli
Args::REQARG],
+ Cli
\Args::REQUIRED|Cli\Args::SINGLE|Cli\
Args::REQARG],
["r", "release", "Extension release version",
["r", "release", "Extension release version",
- Cli
Args::REQUIRED|CliArgs::SINGLE|Cli
Args::REQARG],
+ Cli
\Args::REQUIRED|Cli\Args::SINGLE|Cli\
Args::REQARG],
["s", "source", "Extension source directory",
["s", "source", "Extension source directory",
- Cli
Args::REQUIRED|CliArgs::SINGLE|Cli
Args::REQARG],
+ Cli
\Args::REQUIRED|Cli\Args::SINGLE|Cli\
Args::REQARG],
["g", "git", "Use `git ls-tree` to determine file list",
["g", "git", "Use `git ls-tree` to determine file list",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::NOARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::NOARG],
["b", "branch", "Checkout this tag/branch",
["b", "branch", "Checkout this tag/branch",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::REQARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::REQARG],
["p", "pecl", "Use PECL package.xml to determine file list, name and release",
["p", "pecl", "Use PECL package.xml to determine file list, name and release",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::NOARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::NOARG],
["d", "dest", "Destination directory",
["d", "dest", "Destination directory",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::REQARG,
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::REQARG,
"."],
["z", "gzip", "Create additional PHAR compressed with gzip",
"."],
["z", "gzip", "Create additional PHAR compressed with gzip",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::NOARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::NOARG],
["Z", "bzip", "Create additional PHAR compressed with bzip",
["Z", "bzip", "Create additional PHAR compressed with bzip",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::NOARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::NOARG],
["S", "sign", "Sign the PHAR with a private key",
["S", "sign", "Sign the PHAR with a private key",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|Cli
Args::REQARG],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\
Args::REQARG],
["E", "zend", "Mark as Zend Extension",
["E", "zend", "Mark as Zend Extension",
- Cli
Args::OPTIONAL|CliARgs::SINGLE|Cli
Args::NOARG],
+ Cli
\Args::OPTIONAL|CliARgs::SINGLE|Cli\
Args::NOARG],
[null, "signature", "Show pharext signature",
[null, "signature", "Show pharext signature",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|Cli
Args::HALT],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\
Args::HALT],
[null, "license", "Show pharext license",
[null, "license", "Show pharext license",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|Cli
Args::HALT],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\
Args::HALT],
[null, "version", "Show pharext version",
[null, "version", "Show pharext version",
- Cli
Args::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|Cli
Args::HALT],
+ Cli
\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\
Args::HALT],
]);
}
]);
}
@@
-107,8
+105,8
@@
class Packager implements Command
}
try {
}
try {
- /* source needs to be evaluated before CliArgs validation,
- * so e.g. name and version can be overriden and CliArgs
+ /* source needs to be evaluated before Cli
\
Args validation,
+ * so e.g. name and version can be overriden and Cli
\
Args
* does not complain about missing arguments
*/
$this->loadSource();
* does not complain about missing arguments
*/
$this->loadSource();