Updated minify, jQuery, MixItUp and Tooltipster

This commit is contained in:
Jano Slota 2014-05-05 22:55:36 +02:00 committed by czaks
parent 593560956c
commit c25b8f01c5
22 changed files with 467 additions and 330 deletions

View file

@ -2,6 +2,9 @@
namespace MrClay;
use MrClay\Cli\Arg;
use InvalidArgumentException;
/**
* Forms a front controller for a console app, handling and validating arguments (options)
*
@ -51,7 +54,7 @@ class Cli {
public $isHelpRequest = false;
/**
* @var array of Cli\Arg
* @var Arg[]
*/
protected $_args = array();
@ -80,8 +83,8 @@ class Cli {
}
/**
* @param Cli\Arg|string $letter
* @return Cli\Arg
* @param Arg|string $letter
* @return Arg
*/
public function addOptionalArg($letter)
{
@ -89,8 +92,8 @@ class Cli {
}
/**
* @param Cli\Arg|string $letter
* @return Cli\Arg
* @param Arg|string $letter
* @return Arg
*/
public function addRequiredArg($letter)
{
@ -100,17 +103,17 @@ class Cli {
/**
* @param string $letter
* @param bool $required
* @param Cli\Arg|null $arg
* @return Cli\Arg
* @throws \InvalidArgumentException
* @param Arg|null $arg
* @return Arg
* @throws InvalidArgumentException
*/
public function addArgument($letter, $required, Cli\Arg $arg = null)
public function addArgument($letter, $required, Arg $arg = null)
{
if (! preg_match('/^[a-zA-Z]$/', $letter)) {
throw new \InvalidArgumentException('$letter must be in [a-zA-z]');
throw new InvalidArgumentException('$letter must be in [a-zA-Z]');
}
if (! $arg) {
$arg = new Cli\Arg($required);
$arg = new Arg($required);
}
$this->_args[$letter] = $arg;
return $arg;
@ -118,7 +121,7 @@ class Cli {
/**
* @param string $letter
* @return Cli\Arg|null
* @return Arg|null
*/
public function getArgument($letter)
{
@ -143,7 +146,7 @@ class Cli {
$lettersUsed = '';
foreach ($this->_args as $letter => $arg) {
/* @var Cli\Arg $arg */
/* @var Arg $arg */
$options .= $letter;
$lettersUsed .= $letter;
@ -159,7 +162,7 @@ class Cli {
$this->debug['getopt_return'] = $o;
foreach ($this->_args as $letter => $arg) {
/* @var Cli\Arg $arg */
/* @var Arg $arg */
$this->values[$letter] = false;
if (isset($o[$letter])) {
if (is_bool($o[$letter])) {
@ -295,7 +298,7 @@ class Cli {
{
$r = "\n";
foreach ($this->_args as $letter => $arg) {
/* @var Cli\Arg $arg */
/* @var Arg $arg */
$desc = $arg->getDescription();
$flag = " -$letter ";
if ($arg->mayHaveValue) {