From 2f8bf614e7df98487dc52884f60af4ed17f3977e Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Mon, 10 Mar 2014 08:10:13 +0200 Subject: [PATCH] update missing-tools --- composer.json | 4 +- composer.lock | 81 +++++++++++++++---------------- ipf/admin/model.php | 8 +-- ipf/admin/modelinline.php | 2 +- ipf/auth/models/User.php | 4 +- ipf/form/field.php | 2 +- ipf/form/field/file.php | 8 +-- ipf/form/model.php | 2 +- ipf/form/widget/dateinput.php | 2 +- ipf/form/widget/datetimeinput.php | 2 +- ipf/http/response.php | 2 +- 11 files changed, 58 insertions(+), 59 deletions(-) diff --git a/composer.json b/composer.json index b86abf1..ca6f242 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "require": { "pear/archive_tar": "1.3.*", "mustangostang/spyc": "0.5.*", - "andy128k/missing-tools": "0.1.*", - "andy128k/pegp": "0.*", + "andy128k/missing-tools": "0.2.*@dev", + "andy128k/pegp": "0.1.*@dev", "andy128k/routeexpression": "dev-master", "andy128k/ipf-template": "dev-master" }, diff --git a/composer.lock b/composer.lock index 3d8aa6b..504f173 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "4ee0ab60c8edc915f080d08ccb504a6f", + "hash": "6db86b9f680b207eb96f3a29764ab6ea", "packages": [ { "name": "andy128k/ipf-template", @@ -40,25 +40,20 @@ }, { "name": "andy128k/missing-tools", - "version": "0.1", + "version": "0.2.x-dev", "source": { "type": "git", "url": "git://git.andy128k.net/missing-tools.git", - "reference": "f1323eee669cab0010d447dcdfa37f471adbf795" + "reference": "d01d26b8e4b83e3779983f3d2f2eaea137067446" }, "require": { - "andy128k/pegp": "0.*", + "andy128k/pegp": "0.1.*@dev", "php": ">=5.3" }, "require-dev": { "phpunit/phpunit": "3.7.*" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.1-dev" - } - }, "autoload": { "classmap": [ "src/" @@ -74,15 +69,15 @@ } ], "description": "Miscellaneous utilities", - "time": "2013-12-17 18:59:27" + "time": "2014-02-26 22:23:08" }, { "name": "andy128k/pegp", - "version": "0.1", + "version": "0.1.x-dev", "source": { "type": "git", "url": "git://git.andy128k.net/pegp.git", - "reference": "1b4afb00bdda8d2814f61473cb6c89163db435d0" + "reference": "b015277817ab535ab4634741dd30425bf267082e" }, "require-dev": { "phpunit/phpunit": "3.7.*" @@ -108,7 +103,7 @@ } ], "description": "PEG", - "time": "2013-12-17 16:15:27" + "time": "2014-02-26 22:19:47" }, { "name": "andy128k/routeexpression", @@ -239,22 +234,22 @@ "packages-dev": [ { "name": "phpunit/php-code-coverage", - "version": "1.2.13", + "version": "1.2.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94" + "reference": "69e55e68481cf708a6db43aff0b504e31402fe27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/466e7cd2554b4e264c9e3f31216d25ac0e5f3d94", - "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/69e55e68481cf708a6db43aff0b504e31402fe27", + "reference": "69e55e68481cf708a6db43aff0b504e31402fe27", "shasum": "" }, "require": { "php": ">=5.3.3", "phpunit/php-file-iterator": ">=1.3.0@stable", - "phpunit/php-text-template": ">=1.1.1@stable", + "phpunit/php-text-template": ">=1.2.0@stable", "phpunit/php-token-stream": ">=1.1.3@stable" }, "require-dev": { @@ -296,7 +291,7 @@ "testing", "xunit" ], - "time": "2013-09-10 08:14:32" + "time": "2014-02-25 03:34:05" }, { "name": "phpunit/php-file-iterator", @@ -345,16 +340,16 @@ }, { "name": "phpunit/php-text-template", - "version": "1.1.4", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23" + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5180896f51c5b3648ac946b05f9ec02be78a0b23", - "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", "shasum": "" }, "require": { @@ -385,7 +380,7 @@ "keywords": [ "template" ], - "time": "2012-10-31 18:15:28" + "time": "2014-01-30 17:20:04" }, { "name": "phpunit/php-timer", @@ -433,16 +428,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e" + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5220af2a7929aa35cf663d97c89ad3d50cf5fa3e", - "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", "shasum": "" }, "require": { @@ -479,20 +474,20 @@ "keywords": [ "tokenizer" ], - "time": "2013-09-13 04:58:23" + "time": "2014-03-03 05:10:30" }, { "name": "phpunit/phpunit", - "version": "3.7.28", + "version": "3.7.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3b97c8492bcafbabe6b6fbd2ab35f2f04d932a8d" + "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b97c8492bcafbabe6b6fbd2ab35f2f04d932a8d", - "reference": "3b97c8492bcafbabe6b6fbd2ab35f2f04d932a8d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2752cbb9ea5bd84c2811b34b6953f76965ec7a2f", + "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f", "shasum": "" }, "require": { @@ -509,7 +504,7 @@ "symfony/yaml": "~2.0" }, "require-dev": { - "pear-pear/pear": "1.9.4" + "pear-pear.php.net/pear": "1.9.4" }, "suggest": { "ext-json": "*", @@ -553,7 +548,7 @@ "testing", "xunit" ], - "time": "2013-10-17 07:27:40" + "time": "2014-02-25 03:47:29" }, { "name": "phpunit/phpunit-mock-objects", @@ -606,17 +601,17 @@ }, { "name": "symfony/yaml", - "version": "v2.4.0", + "version": "v2.4.2", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "1ae235a1b9d3ad3d9f3860ff20acc072df95b7f5" + "reference": "bb6ddaf8956139d1b8c360b4b713ed0138e876b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/1ae235a1b9d3ad3d9f3860ff20acc072df95b7f5", - "reference": "1ae235a1b9d3ad3d9f3860ff20acc072df95b7f5", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/bb6ddaf8956139d1b8c360b4b713ed0138e876b3", + "reference": "bb6ddaf8956139d1b8c360b4b713ed0138e876b3", "shasum": "" }, "require": { @@ -640,7 +635,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Symfony Community", @@ -649,7 +646,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-11-26 16:40:27" + "time": "2014-01-07 13:28:54" } ], "aliases": [ @@ -657,6 +654,8 @@ ], "minimum-stability": "stable", "stability-flags": { + "andy128k/missing-tools": 20, + "andy128k/pegp": 20, "andy128k/routeexpression": 20, "andy128k/ipf-template": 20 }, diff --git a/ipf/admin/model.php b/ipf/admin/model.php index 5eb1459..2df9115 100644 --- a/ipf/admin/model.php +++ b/ipf/admin/model.php @@ -91,7 +91,7 @@ class BooleanFilter extends BaseListFilter public function SetSelect($request) { - switch (ArrayTools::get($request->GET, 'filter_'.$this->column)) { + switch (\PFF\Arr::get($request->GET, 'filter_'.$this->column)) { case 'y': $this->choices[1]['selected'] = true; break; @@ -105,7 +105,7 @@ class BooleanFilter extends BaseListFilter public function FilterQuery($request, $query) { - switch (ArrayTools::get($request->GET, 'filter_'.$this->column)) { + switch (\PFF\Arr::get($request->GET, 'filter_'.$this->column)) { case 'y': $query->addWhere($this->column); break; @@ -398,7 +398,7 @@ class IPF_Admin_Model { $ma = new $classAdmin($classModel); self::$models[$classModel] = $ma; - foreach (ArrayTools::get(self::$handlers, $classModel, array()) as $action) { + foreach (\PFF\Arr::get(self::$handlers, $classModel, array()) as $action) { call_user_func($action, $ma); } unset(self::$handlers[$classModel]); @@ -424,7 +424,7 @@ class IPF_Admin_Model if (array_key_exists($classModel, self::$models)) { call_user_func($action, self::$models[$classModel]); } else { - ArrayTools::pushToKey(self::$handlers, $classModel, $action); + \PFF\Arr::pushToKey(self::$handlers, $classModel, $action); } } diff --git a/ipf/admin/modelinline.php b/ipf/admin/modelinline.php index b772370..1e4e090 100644 --- a/ipf/admin/modelinline.php +++ b/ipf/admin/modelinline.php @@ -66,7 +66,7 @@ abstract class IPF_Admin_ModelInline if (!$form->isValid()) { $empty = true; foreach ($form->data as $k => $v) { - if (is_array($v) && ArrayTools::get($v, 'error') === 4) { + if (is_array($v) && \PFF\Arr::get($v, 'error') === 4) { // empty file } elseif ($k !== $form->prefix.'is_remove' && $v) { $empty = false; diff --git a/ipf/auth/models/User.php b/ipf/auth/models/User.php index 5e5ba93..461ba31 100644 --- a/ipf/auth/models/User.php +++ b/ipf/auth/models/User.php @@ -4,8 +4,8 @@ class IPFAuthAdminUserForm extends IPF_Form_Model { function initFields($extra=array()) { - ArrayTools::pushToKey($extra, 'exclude', 'UserRole'); - ArrayTools::pushToKey($extra, 'exclude', 'UserPermission'); + \PFF\Arr::pushToKey($extra, 'exclude', 'UserRole'); + \PFF\Arr::pushToKey($extra, 'exclude', 'UserPermission'); parent::initFields($extra); $this->fields['email']->label = 'E-mail'; diff --git a/ipf/form/field.php b/ipf/form/field.php index bd0f10a..422feb4 100644 --- a/ipf/form/field.php +++ b/ipf/form/field.php @@ -17,7 +17,7 @@ class IPF_Form_Field function __construct($params=array()) { - $widget_attrs = ArrayTools::pop($params, 'widget_attrs', array()); + $widget_attrs = \PFF\Arr::pop($params, 'widget_attrs', array()); $default = array(); foreach ($params as $key=>$in) { diff --git a/ipf/form/field/file.php b/ipf/form/field/file.php index e8b5bf0..14c0b2a 100644 --- a/ipf/form/field/file.php +++ b/ipf/form/field/file.php @@ -39,15 +39,15 @@ class IPF_Form_Field_File extends IPF_Form_Field { IPF_Utils::makeDirectories($this->getAbsolutePath('')); - if (ArrayTools::get($value, 'remove')) + if (\PFF\Arr::get($value, 'remove')) return $this->removeFile($value['data']); - $oldname = ArrayTools::get($value, 'name', ''); - $newname = ArrayTools::get($value, 'rename', ''); + $oldname = \PFF\Arr::get($value, 'name', ''); + $newname = \PFF\Arr::get($value, 'rename', ''); if ($oldname != $newname) return $this->renameFile($oldname, $newname); - switch (ArrayTools::get($value['data'], 'error')) { + switch (\PFF\Arr::get($value['data'], 'error')) { case UPLOAD_ERR_OK: break; default: diff --git a/ipf/form/model.php b/ipf/form/model.php index 817a243..e2fa258 100644 --- a/ipf/form/model.php +++ b/ipf/form/model.php @@ -15,7 +15,7 @@ class IPF_Form_Model extends IPF_Form if (isset($extra['user_fields'])) $this->user_fields = $extra['user_fields']; - $exclude = ArrayTools::get($extra, 'exclude', array()); + $exclude = \PFF\Arr::get($extra, 'exclude', array()); $fields = $this->suggestFields($this->model->getTable(), $this->fields(), $exclude, $this); foreach ($fields as $field) { list($n, $f) = $field; diff --git a/ipf/form/widget/dateinput.php b/ipf/form/widget/dateinput.php index 2a79814..a2ac015 100644 --- a/ipf/form/widget/dateinput.php +++ b/ipf/form/widget/dateinput.php @@ -7,7 +7,7 @@ class IPF_Form_Widget_DateInput extends IPF_Form_Widget_Input public function __construct($attrs=array()) { - $format = ArrayTools::pop($attrs, 'format'); + $format = \PFF\Arr::pop($attrs, 'format'); if ($format) $this->format = is_string($format) ? IPF_Format::dateFlagsFromString($format) : $format; diff --git a/ipf/form/widget/datetimeinput.php b/ipf/form/widget/datetimeinput.php index 73b8509..c390cb6 100644 --- a/ipf/form/widget/datetimeinput.php +++ b/ipf/form/widget/datetimeinput.php @@ -7,7 +7,7 @@ class IPF_Form_Widget_DatetimeInput extends IPF_Form_Widget_Input public function __construct($attrs=array()) { - $format = ArrayTools::pop($attrs, 'format'); + $format = \PFF\Arr::pop($attrs, 'format'); if ($format) $this->format = is_string($format) ? IPF_Format::datetimeFlagsFromString($format) : $format; diff --git a/ipf/http/response.php b/ipf/http/response.php index 071b5af..429a652 100644 --- a/ipf/http/response.php +++ b/ipf/http/response.php @@ -68,7 +68,7 @@ class IPF_HTTP_Response if ($this->status_code >= 200 && $this->status_code != 204 && $this->status_code != 304 - && !ArrayTools::get($this->headers, 'Content-Length')) { + && !\PFF\Arr::get($this->headers, 'Content-Length')) { $this->headers['Content-Length'] = strlen($this->content); } -- 2.49.0