diff --git a/composer.json b/composer.json
index 177ace6dae8570ff9573842797ca442a4434b09d..acf13a422920e3fc85c9e3682ac5d766a2a85a25 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
"pear-pear.php.net/validate_ispn": "*",
"serialssolutions/summon": "dev-master",
"symfony/yaml": "*",
- "zendframework/zendframework": "2.1.5",
+ "zendframework/zendframework": "2.2.0",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*"
}
diff --git a/composer.lock b/composer.lock
index 4529aa80f94d3b31dad8d6213aab6c54adfd6f04..46602e0a55dfa309d79804efad5b7ddad718bfb7 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": "6d15916402b119f0730b7a6b16b86123",
+ "hash": "fdb889414f2d72a89f529eb202d2e2c0",
"packages": [
{
"name": "johnwohlers/sip2",
@@ -368,17 +368,17 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.1.5",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "release-2.1.5"
+ "reference": "release-2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.1.5-release-2.1.5-acb4f2.zip",
- "reference": "2.1.5",
- "shasum": "6a883d6e6facdb24998ab5ab53d2b941c8ec8995"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.0-release-2.2.0-d642a8.zip",
+ "reference": "2.2.0",
+ "shasum": "d89721110070b0c272be791a3dc83a4092a3b928"
},
"require": {
"php": ">=5.3.3"
@@ -436,16 +436,17 @@
"zendframework/zend-xmlrpc": "self.version"
},
"require-dev": {
- "doctrine/common": ">=2.1",
+ "doctrine/annotations": ">=1.0",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
+ "ocramius/proxy-manager": "0.3.*",
"phpunit/phpunit": "3.7.*"
},
"suggest": {
- "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
- "ext-intl": "ext/intl for i18n features",
+ "doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
+ "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
"ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "pecl-weakref": "Implementation of weak references for Zend\\Stdlib\\CallbackHandler",
+ "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
"zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
@@ -455,8 +456,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
},
"autoload": {
@@ -475,10 +476,10 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.1.5",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.0",
"issues": "https://github.com/zendframework/zf2/issues"
},
- "time": "2013-04-17 15:15:58"
+ "time": "2013-05-15 10:27:32"
},
{
"name": "zendframework/zendrest",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index fccf34acf2b1b0a28ebc5e30d3015865586aac16..cc734df7ab000b804474af7ef4272538088aeac0 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit80d82f7b0700080918fdf5576627aa44::getLoader();
+return ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 6f44913e1133df91f4e12f4eb2db25310cde3c5e..9bf5c06fec3acd3dd74318899a4594c035c9ab43 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
-class ComposerAutoloaderInit80d82f7b0700080918fdf5576627aa44
+class ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit80d82f7b0700080918fdf5576627aa44
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit80d82f7b0700080918fdf5576627aa44', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit80d82f7b0700080918fdf5576627aa44', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 85484e8dbbcb052b3e90ebec1ca599cad9a7ac75..46ee7ec8033514c360d036282fe0199bbec64823 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -486,18 +486,18 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.1.5",
- "version_normalized": "2.1.5.0",
+ "version": "2.2.0",
+ "version_normalized": "2.2.0.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "release-2.1.5"
+ "reference": "release-2.2.0"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.1.5-release-2.1.5-acb4f2.zip",
- "reference": "2.1.5",
- "shasum": "6a883d6e6facdb24998ab5ab53d2b941c8ec8995"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.0-release-2.2.0-d642a8.zip",
+ "reference": "2.2.0",
+ "shasum": "d89721110070b0c272be791a3dc83a4092a3b928"
},
"require": {
"php": ">=5.3.3"
@@ -555,28 +555,29 @@
"zendframework/zend-xmlrpc": "self.version"
},
"require-dev": {
- "doctrine/common": ">=2.1",
+ "doctrine/annotations": ">=1.0",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
+ "ocramius/proxy-manager": "0.3.*",
"phpunit/phpunit": "3.7.*"
},
"suggest": {
- "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
- "ext-intl": "ext/intl for i18n features",
+ "doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
+ "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
"ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "pecl-weakref": "Implementation of weak references for Zend\\Stdlib\\CallbackHandler",
+ "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
"zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
- "time": "2013-04-17 15:15:58",
+ "time": "2013-05-15 10:27:32",
"bin": [
"bin/classmap_generator.php"
],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
},
"installation-source": "dist",
@@ -596,7 +597,7 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.1.5",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.0",
"issues": "https://github.com/zendframework/zf2/issues"
}
}
diff --git a/vendor/zendframework/zendframework/CHANGELOG.md b/vendor/zendframework/zendframework/CHANGELOG.md
index 796af393faf5412ed73b2085a23b578c1e3c1595..36c485a2a76f0effd971d5704bafe5afbc639959 100644
--- a/vendor/zendframework/zendframework/CHANGELOG.md
+++ b/vendor/zendframework/zendframework/CHANGELOG.md
@@ -1,6 +1,193 @@
# CHANGELOG
-## 2.1.5 (17 Apr 2017):
+## 2.2.0 (TBD):
+
+- [2865: (Enhancement) Add an easier way to use i18n view helpers.](https://github.com/zendframework/zf2/issues/2865)
+- [2903: add AdapterManager in to Zend\Db\Adapter namespace](https://github.com/zendframework/zf2/issues/2903)
+- [2984: Add full stop at end of validator messages (fixes #2966)](https://github.com/zendframework/zf2/issues/2984)
+- [3490: Added support for callable credential validator](https://github.com/zendframework/zf2/issues/3490)
+- [3580: Feature/context aware hydrator strategies](https://github.com/zendframework/zf2/issues/3580)
+- [3632: New DateTimeFormatter Filter (#3617)](https://github.com/zendframework/zf2/issues/3632)
+- [3646: Zend\I18n\View\Helper\NumberFormat param to set the number of decimals](https://github.com/zendframework/zf2/issues/3646)
+- [3693: Add RBAC support for navigation helper.](https://github.com/zendframework/zf2/issues/3693)
+- [3709: Redis cache storage](https://github.com/zendframework/zf2/issues/3709)
+- [3710: Allow to remove delimiters for DateSelect and fix bugs with some locales](https://github.com/zendframework/zf2/issues/3710)
+- [3747: Add getFilename() to Zend\Cache\Pattern\CaptureCache](https://github.com/zendframework/zf2/issues/3747)
+- [3754: Update library/Zend/Stdlib/Hydrator/ClassMethods.php](https://github.com/zendframework/zf2/issues/3754)
+- [3792: Sets specific attributes (as class,title...) to "Zend\Form\Select" options](https://github.com/zendframework/zf2/issues/3792)
+- [3812: Zend\Form\FormInterface causes Di to attempt to instantiate Interface](https://github.com/zendframework/zf2/issues/3812)
+- [3814: Improve module manager to accept instance](https://github.com/zendframework/zf2/issues/3814)
+- [3818: Invalid instantiator of type “NULL†for “Zend\Form\FormInterfaceâ€](https://github.com/zendframework/zf2/issues/3818)
+- [3844: Added new option to fix a little issue originated from last PR](https://github.com/zendframework/zf2/issues/3844)
+- [3876: Implementing and re-utilizing an abstract aggregate listener](https://github.com/zendframework/zf2/issues/3876)
+- [3877: HeadTitle renderTitle returns rendered title without title tags](https://github.com/zendframework/zf2/issues/3877)
+- [3878: Created an adapter Zend Paginator instance using TableGateway](https://github.com/zendframework/zf2/issues/3878)
+- [3879: Feature CollectionInputFilter](https://github.com/zendframework/zf2/issues/3879)
+- [3896: Added ability to ignore namespaces to classmap generator](https://github.com/zendframework/zf2/issues/3896)
+- [3919: WSDL Generation rewrite (with new tests also) as a base for future changes.](https://github.com/zendframework/zf2/issues/3919)
+- [3922: Added the ability to disable the getValidator input specification on Select Elements](https://github.com/zendframework/zf2/issues/3922)
+- [3930: Added abstract service factory for logger component to provide several loggers for application.](https://github.com/zendframework/zf2/issues/3930)
+- [3931: Added ability to configure MvcEvent listeners.](https://github.com/zendframework/zf2/issues/3931)
+- [3933: Added database adapter abstract service factory.](https://github.com/zendframework/zf2/issues/3933)
+- [3942: Feature/zend test load module](https://github.com/zendframework/zf2/issues/3942)
+- [3944: Enable ExceptionStrategy to return json](https://github.com/zendframework/zf2/issues/3944)
+- [3949: Invalid argument supplied for foreach()](https://github.com/zendframework/zf2/issues/3949)
+- [3951: Deprecate Zend\Stdlib\DateTime and use \DateTime constructor internally instead](https://github.com/zendframework/zf2/issues/3951)
+- [3958: Oci8 Driver generating "Fetch out of sequence warning"](https://github.com/zendframework/zf2/issues/3958)
+- [3965: Add removeMethod method in ClassGenerator](https://github.com/zendframework/zf2/issues/3965)
+- [3979: Fixes #3978](https://github.com/zendframework/zf2/issues/3979)
+- [3990: Zend\Filter\File\RenameUpload - Added possibility to maintain original file extension](https://github.com/zendframework/zf2/issues/3990)
+- [3999: Chain route](https://github.com/zendframework/zf2/issues/3999)
+- [4011: extend HeadMeta view helper to allow microdata #3751](https://github.com/zendframework/zf2/issues/4011)
+- [4016: Hydrator aware interface](https://github.com/zendframework/zf2/issues/4016)
+- [4032: Class was supporting limit + offset or limit, but only offset does not support](https://github.com/zendframework/zf2/issues/4032)
+- [4048: Moved ext-intl to suggest instead of require to avoid silent fallback.](https://github.com/zendframework/zf2/issues/4048)
+- [4050: Translable routing segments](https://github.com/zendframework/zf2/issues/4050)
+- [4073: Fixed issue #3064](https://github.com/zendframework/zf2/issues/4073)
+- [4098: fix php docblock : boolean should be bool](https://github.com/zendframework/zf2/issues/4098)
+- [4099: fix (bool) casting : add space and use (bool) instead of (boolean) to cast](https://github.com/zendframework/zf2/issues/4099)
+- [4104: Allow to change option creations for plugin manager](https://github.com/zendframework/zf2/issues/4104)
+- [4120: (Validator) Only return unique messages](https://github.com/zendframework/zf2/issues/4120)
+- [4127: Added I18n PhoneNumber validator based off of country](https://github.com/zendframework/zf2/issues/4127)
+- [4137: View helpers cleanup](https://github.com/zendframework/zf2/issues/4137)
+- [4139: Service manager performance optimized](https://github.com/zendframework/zf2/issues/4139)
+- [4145: Delegate factories](https://github.com/zendframework/zf2/issues/4145)
+- [4146: Lazy services](https://github.com/zendframework/zf2/issues/4146)
+- [4155: Move Identity closure to separate factory](https://github.com/zendframework/zf2/issues/4155)
+- [4165: Validate empty with context](https://github.com/zendframework/zf2/issues/4165)
+- [4169: Fixed error in adapter paginator DbTableGateway](https://github.com/zendframework/zf2/issues/4169)
+- [4170: Hydrator aware interface](https://github.com/zendframework/zf2/issues/4170)
+- [4175: AbstractRestfulController uses wrong action for id=0](https://github.com/zendframework/zf2/issues/4175)
+- [4178: Allow passing objects to the url helper](https://github.com/zendframework/zf2/issues/4178)
+- [4181: Make identifier name configurable for AbstractRestfulController](https://github.com/zendframework/zf2/issues/4181)
+- [4187: Add event manager as soft dependency to translator](https://github.com/zendframework/zf2/issues/4187)
+- [4202: Zend\Log has dependency on Zend\ServiceManager](https://github.com/zendframework/zf2/issues/4202)
+- [4204: Hotfix for #4202](https://github.com/zendframework/zf2/issues/4204)
+- [4206: Added sequence name for PostgreSQL](https://github.com/zendframework/zf2/issues/4206)
+- [4215: Bugfix for redirection handling in Zend\Http\Client](https://github.com/zendframework/zf2/issues/4215)
+- [4219: Custom validators registered through ValidatorProviderInterface not found](https://github.com/zendframework/zf2/issues/4219)
+- [4231: (Form) Get Elements for Collection](https://github.com/zendframework/zf2/issues/4231)
+- [4238: ValueGenerator constant detection](https://github.com/zendframework/zf2/issues/4238)
+- [4247: Added Brazilian IBAN format to IBAN validation](https://github.com/zendframework/zf2/issues/4247)
+- [4250: (#4249) Override 'ServiceManager::has' to do not use peering service managers](https://github.com/zendframework/zf2/issues/4250)
+- [4251: Create factories for selected view collaborators](https://github.com/zendframework/zf2/issues/4251)
+- [4252: Auto-upgrading and then displaying composer version](https://github.com/zendframework/zf2/issues/4252)
+- [4253: Create AbstractFactory for Cache](https://github.com/zendframework/zf2/issues/4253)
+- [4254: Use prefix in Logger abstract factory](https://github.com/zendframework/zf2/issues/4254)
+- [4259: Hotfix: Changed array\_walk to foreach in Zend\Stdlib\Hydrator\ArraySerializable](https://github.com/zendframework/zf2/issues/4259)
+- [4260: Validator\Explode can take option validator as array](https://github.com/zendframework/zf2/issues/4260)
+- [4262: Fixed console routes when using same name for group and parameter](https://github.com/zendframework/zf2/issues/4262)
+- [4263: Remove superfluous indentation from one line of code](https://github.com/zendframework/zf2/issues/4263)
+- [4268: Session service factories](https://github.com/zendframework/zf2/issues/4268)
+- [4269: Hotfix: cs fixer check](https://github.com/zendframework/zf2/issues/4269)
+- [4276: allow default http responses to be sent in mvc stack](https://github.com/zendframework/zf2/issues/4276)
+- [4279: Remove needless is\_object check](https://github.com/zendframework/zf2/issues/4279)
+- [4282: fix getHref strategy in PageMvc](https://github.com/zendframework/zf2/issues/4282)
+- [4284: Main framework composer.json is incorrectly configured](https://github.com/zendframework/zf2/issues/4284)
+- [4285: Fix for a problem with Service Manager and Abstract Factories](https://github.com/zendframework/zf2/issues/4285)
+- [4288: Reset URI parts before parse](https://github.com/zendframework/zf2/issues/4288)
+- [4289: Minor CS fix](https://github.com/zendframework/zf2/issues/4289)
+- [4293: Better fix for #4284](https://github.com/zendframework/zf2/issues/4293)
+- [4294: BaseInputFilter not populating InputFilters of Element\Collection](https://github.com/zendframework/zf2/issues/4294)
+- [4295: Console route defaults should be overridden by entered values](https://github.com/zendframework/zf2/issues/4295)
+- [4296: illegal usage of array\_walk in ObjectProperty, ClassMapAutoloader](https://github.com/zendframework/zf2/issues/4296)
+- [4298: View\Helper\Navigation\Menu: add flag to set page class to <li>](https://github.com/zendframework/zf2/issues/4298)
+- [4299: Suggestion: Don't render empty module console information](https://github.com/zendframework/zf2/issues/4299)
+- [4300: Maestro detection improvements in Zend\Validator\CreditCard](https://github.com/zendframework/zf2/issues/4300)
+- [4301: remove extra semicolon](https://github.com/zendframework/zf2/issues/4301)
+- [4303: Method annotations of Zend\Validator\Hostname constructor](https://github.com/zendframework/zf2/issues/4303)
+- [4311: DDL support for Zend\Db](https://github.com/zendframework/zf2/issues/4311)
+- [4312: POP3 protocol "return;" is needed after APOP request](https://github.com/zendframework/zf2/issues/4312)
+- [4313: update docblock for ZendTest : /Db/, /Code/ , /Di/, /Log/, Mvc/](https://github.com/zendframework/zf2/issues/4313)
+- [4317: Fix #4315 - Console routes with dashes are not understood.](https://github.com/zendframework/zf2/issues/4317)
+- [4319: Add various plugin manager](https://github.com/zendframework/zf2/issues/4319)
+- [4321: Hotfix/cs fixer installation](https://github.com/zendframework/zf2/issues/4321)
+- [4326: Add zh\_TW translations ](https://github.com/zendframework/zf2/issues/4326)
+- [4328: Fix 4294](https://github.com/zendframework/zf2/issues/4328)
+- [4330: Remove SM-Aware requirement from Forward plugin](https://github.com/zendframework/zf2/issues/4330)
+- [4331: Changed default version service to Zend.](https://github.com/zendframework/zf2/issues/4331)
+- [4336: Use is\_int() instead of is\_integer()](https://github.com/zendframework/zf2/issues/4336)
+- [4337: Fix alignment of values, add trailing comma](https://github.com/zendframework/zf2/issues/4337)
+- [4339: Remove @return annotation from constructor doc-block](https://github.com/zendframework/zf2/issues/4339)
+- [4341: Docblocks do not match](https://github.com/zendframework/zf2/issues/4341)
+- [4344: Add missing file level doc-block](https://github.com/zendframework/zf2/issues/4344)
+- [4347: Add empty line after namespace declaration](https://github.com/zendframework/zf2/issues/4347)
+- [4349: Alphabetically order use statements (related to #4338)](https://github.com/zendframework/zf2/issues/4349)
+- [4350: Remove comma before value in array initialization](https://github.com/zendframework/zf2/issues/4350)
+- [4351: fix the constructor's type-autodetection accepts wrong parameters](https://github.com/zendframework/zf2/issues/4351)
+- [4352: Fix doc blocks consistency and coding standards PSR2](https://github.com/zendframework/zf2/issues/4352)
+- [4353: Glob::glob() should throw an exception on error](https://github.com/zendframework/zf2/issues/4353)
+- [4354: Corrected wrong year](https://github.com/zendframework/zf2/issues/4354)
+- [4355: fix docblock : @throw should be @throws](https://github.com/zendframework/zf2/issues/4355)
+- [4356: FormSelect translate optgroup label fix](https://github.com/zendframework/zf2/issues/4356)
+- [4358: Form abstract factory](https://github.com/zendframework/zf2/issues/4358)
+- [4361: Ldap Ldif Decoder bug fix](https://github.com/zendframework/zf2/issues/4361)
+- [4364: AbstractFactory consistency](https://github.com/zendframework/zf2/issues/4364)
+- [4365: Use InputFilterPluginManager in InputFilter\Factory](https://github.com/zendframework/zf2/issues/4365)
+- [4366: Fix for issue #3945, and fix for PUT with request content](https://github.com/zendframework/zf2/issues/4366)
+- [4367: Remove reference to root namespace (fixes #4363)](https://github.com/zendframework/zf2/issues/4367)
+- [4372: Ability to load custom form classes from FormElementManager in Mvc.](https://github.com/zendframework/zf2/issues/4372)
+- [4373: PHP Warning: call\_user\_func() expects…when Weakref enabled](https://github.com/zendframework/zf2/issues/4373)
+- [4374: CollectionInputFilter returns always valid for empty collections](https://github.com/zendframework/zf2/issues/4374)
+- [4376: Fix get with body in ClientStatic](https://github.com/zendframework/zf2/issues/4376)
+- [4378: Add patchList method to AbstractRestfulController](https://github.com/zendframework/zf2/issues/4378)
+- [4379: Fix for #4175](https://github.com/zendframework/zf2/issues/4379)
+- [4380: Decouple I18n\View\Helper\AbstractTranslatorHelper from ext\intl](https://github.com/zendframework/zf2/issues/4380)
+- [4382: Fix conflict InputFilter::type with Input::name in InputFilter factory](https://github.com/zendframework/zf2/issues/4382)
+- [4383: ensure the wrapElements option in Zend\Form\Form::prepareElement](https://github.com/zendframework/zf2/issues/4383)
+- [4389: Remove cache and log abstract factories from MVC](https://github.com/zendframework/zf2/issues/4389)
+- [4391: Segregated interfaces for Translator dependency of Validator component](https://github.com/zendframework/zf2/issues/4391)
+- [4392: Remove Version dependency from Feed component](https://github.com/zendframework/zf2/issues/4392)
+- [4393: 2.2RC1 BC Break: DateTimeFormatter sets blank data to today's date](https://github.com/zendframework/zf2/issues/4393)
+- [4394: Ensure that DateTimeFormatter doesn't format an empty string](https://github.com/zendframework/zf2/issues/4394)
+- [4396: Make ServiceManager dependency optional in Feed component](https://github.com/zendframework/zf2/issues/4396)
+- [4398: Allow DateTimeFormatter to format zero.](https://github.com/zendframework/zf2/issues/4398)
+- [4405: 2.2.0RC1 Form\View\Helper\FormRow "partial view" messed up](https://github.com/zendframework/zf2/issues/4405)
+- [4408: Optimize MutableCreationOptionsInterface capability](https://github.com/zendframework/zf2/issues/4408)
+- [4410: Fix conflict between translator service in ZF2 and skeleton app](https://github.com/zendframework/zf2/issues/4410)
+- [4411: Fix BC break in HTTP client resetParameters signature](https://github.com/zendframework/zf2/issues/4411)
+- [4412: FormRow: enable partial rendering](https://github.com/zendframework/zf2/issues/4412)
+- [4415: Remove URI dependency and make HTTP dependency optional in Feed](https://github.com/zendframework/zf2/issues/4415)
+- [4417: add docblock to I18n\Validator\PhoneNumber\{Code\}.php](https://github.com/zendframework/zf2/issues/4417)
+- [4418: remove @package docblock from demos files](https://github.com/zendframework/zf2/issues/4418)
+- [4420: sync svn r23693 - (ZF-11002) ehancement implemented as proposed](https://github.com/zendframework/zf2/issues/4420)
+- [4423: Minor param overflow](https://github.com/zendframework/zf2/issues/4423)
+- [4424: Edit config composer.json](https://github.com/zendframework/zf2/issues/4424)
+- [4425: Fix FormElementManagerFactory breaks csrf validation (in Mvc)](https://github.com/zendframework/zf2/issues/4425)
+- [4431: sync svn r24702 - support application/x-zip in Validator\File\IsCompressed](https://github.com/zendframework/zf2/issues/4431)
+- [4432: code concistency : update Zend\Mvc\Application::bootstrap](https://github.com/zendframework/zf2/issues/4432)
+- [4435: Di compatibility (#4434)](https://github.com/zendframework/zf2/issues/4435)
+- [4437: I18n currencyFormat helper: add the currencyPattern attribute and extend the unittest](https://github.com/zendframework/zf2/issues/4437)
+- [4441: Fixed unnecessary error rendering in form row helper.](https://github.com/zendframework/zf2/issues/4441)
+- [4444: Issues found by hphp static analysis](https://github.com/zendframework/zf2/issues/4444)
+- [4447: typo fixes](https://github.com/zendframework/zf2/issues/4447)
+- [4448: Aggregate hydrator ](https://github.com/zendframework/zf2/issues/4448)
+- [4450: Fix iterating over empty result set with buffering enabled](https://github.com/zendframework/zf2/issues/4450)
+- [4451: Form InputFilterSpecification: incorrect propagation](https://github.com/zendframework/zf2/issues/4451)
+- [4454: Fix for expiration value](https://github.com/zendframework/zf2/issues/4454)
+
+### Potential Breakage
+
+`Zend\Validator` was altered to remove the dependency on `Zend\I18n` by creating
+[Segregated Interfaces](http://en.wikipedia.org/wiki/Interface_segregation_principle).
+The practical upshot is that `Zend\Validator\AbstractValidator` no longer
+implements `Zend\I18n\Translator\TranslatorAwareInterface`, but rather
+`Zend\Validator\Translator\TranslatorAwareInterface`, which now typehints on
+`Zend\Validator\Translator\TranslatorInterface` instead of
+`Zend\I18n\Translator\Translator`. This means you cannot pass a
+`Zend\I18n\Translator\Translator` instance directly to a validator any longer.
+
+However, we have included a new class, `Zend\Mvc\I18n\Translator`, that extends
+the i18n Translator class and implements the Validator TranslatorInterface. This
+class may be used as a drop-in replacement. In fact, by default,
+`Zend\Validator\ValidatorPluginManager` is now using the `MvcTranslator`
+service, which utilizes this new class, making the change seamless for most
+users.
+
+The above change will only affect you if you were manually injecting a
+translator instance into your validators.
+
+## 2.1.5 (17 Apr 2013):
- 2536: `Zend\Validate` translations out of date
(https://github.com/zendframework/zf2/issues/2536)
diff --git a/vendor/zendframework/zendframework/README-GIT.md b/vendor/zendframework/zendframework/README-GIT.md
index 593463c85d4d13137c24e465a86d8d423ea22c47..63b09655aeae1532b33d5bf2b1dafa4375c40ab8 100644
--- a/vendor/zendframework/zendframework/README-GIT.md
+++ b/vendor/zendframework/zendframework/README-GIT.md
@@ -73,7 +73,7 @@ repository.
### Pre-Commit Hook (Optional)
-The ZF2 Travis-CI will confirm that code style standards are met
+The ZF2 Travis-CI will confirm that code style standards are met
by using ```php-cs-fixer``` (https://github.com/fabpot/PHP-CS-Fixer) during it's build runs.
To reduce the number of red Travis-CI builds, the following Git pre-commit hook
@@ -85,13 +85,13 @@ can help catch code style issues before committing. Save it as
<?php
/**
* .git/hooks/pre-commit
- *
- * This pre-commit hooks will check for PHP errors (lint), and make sure the
+ *
+ * This pre-commit hooks will check for PHP errors (lint), and make sure the
* code is PSR-2 compliant.
- *
+ *
* Dependecy: PHP-CS-Fixer (https://github.com/fabpot/PHP-CS-Fixer)
- *
- * @author Mardix http://github.com/mardix
+ *
+ * @author Mardix http://github.com/mardix
* @author Matthew Weier O'Phinney http://mwop.net/
* @since 4 Sept 2012
*/
@@ -194,12 +194,12 @@ create a branch for fixing an issue in the tracker.
Switched to a new branch 'zf9295'
```
... do some work ...
-
+
```sh
% git commit
```
... write your log message ...
-
+
```sh
% git push origin HEAD:zf9295
Counting objects: 38, done.
@@ -249,7 +249,7 @@ Once you know that your changes have been accepted to the master
repository, we suggest doing some cleanup of these branches.
- Local branch cleanup
-
+
```sh
% git branch -d <branchname>
```
@@ -275,4 +275,4 @@ on GitHub.
## CONTRIBUTORS AND COMMITTERS
Both Zend's internal Zend Framework team and the members of the Community Review
-team have push privileges to the ZF2 repository.
+team have push privileges to the ZF2 repository.
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 68c232bc55f7495ebfed2a528e5ac5371290cb50..2f6e30cafec1e02ec2d430fbd90b75aed098533e 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -1,17 +1,118 @@
-### Welcome to the *Zend Framework 2.1* Release!
+### Welcome to the *Zend Framework 2.2* Release!
Master: [](http://travis-ci.org/zendframework/zf2)
Develop: [](http://travis-ci.org/zendframework/zf2)
## RELEASE INFORMATION
-*Zend Framework 2.1.5*
+*Zend Framework 2.2.0*
-This is the fifth maintenance release for the version 2.1 series.
+This is the second minor (feature) release for the version 2 series.
-17 Apr 2013
+15 May 2013
-### UPDATES IN 2.1.5
+### UPDATES IN 2.2.0
+
+- **Addition of many more plugin managers and abstract service factories.**
+ In order to simplify usage of the `ServiceManager` as an
+ [Inversion of Control](http://en.wikipedia.org/wiki/Inversion_of_Control)
+ container, as well as to provide more flexibility in and consistency in how various
+ framework components are consumed, a number of plugin managers and service factories
+ were created and enabled.
+
+ Among the various plugin managers created are Translator loader manager, a Hydrator
+ plugin manager (allowing named hydrator instances), and an InputFilter manager.
+
+ New factories include a Translator service factory, and factories for
+ both the Session configuration and SessionManager.
+
+ New abstract factories include one for the DB component (allowing you to manage
+ multiple named adapters), Loggers (for having multiple Logger instances),
+ Cache storage (for managing multiple cache backends), and Forms (which makes use
+ of the existing FormElementsPluginManager, as well as the new Hydrator and InputFilter
+ plugin managers).
+
+- **Data Definition Language (DDL) support in Zend\Db.** DDL
+ provides the ability to create, alter, and drop tables in a relational
+ database system. Zend\Db now offers abstraction around DDL, and
+ specifically MySQL and ANSI SQL-92; we will gradually add this
+ capability for the other database vendors we support.
+
+- **Addition of Zend\Stdlib\Hydrator\Aggregate.** The AggregateHydrator provides
+ an event-driven way to hydrate/extract hierarchical structures, as well as for
+ mapping entities to hydrators for general purpose use.
+
+- **Simplification of dependencies in Zend\Feed.** We either removed or made
+ optional several dependencies in Zend\Feed, making it easier to use standalone
+ and/or with third-party components. We plan a larger story around this for
+ 2.3.0.
+
+- **Authentication:** The DB adapter now supports non-RDBMS credential validation.
+
+- **Cache:** New storage backend: Redis.
+
+- **Code:** The ClassGenerator now has a removeMethod() method.
+
+- **Console:** Incremental improvements to layout and colorization of banners
+ and usage messages; fixes for how literal and non-literal matches are
+ returned.
+
+- **DB:** New DDL support (noted earlier); many incremental improvements.
+
+- **Di:** Improvements around the handling of Aware interfaces to prevent
+ attempts to instantiate interfaces when preferences have not been provided.
+
+- **Filter:** New DateTimeFormatter filter.
+
+- **Form:** Many incremental improvements to selected elements; new
+ FormAbstractServiceFactory for defining form services; minor improvements to
+ make the form component work with the DI service factory.
+
+- **InputFilter**: new CollectionInputFilter for working with form Collections;
+ new InputFilterPluginManager providing integration and services for the
+ ServiceManager.
+
+- **I18n:** We removed ext/intl as a hard requirement, and made it only a
+ suggested requirement; the Translator has an optional dependency on the
+ EventManager, providing the ability to tie into "missing message" and "missing
+ translations" events; new country-specific PhoneNumber validator.
+
+- **ModuleManager:** Now allows passing actual Module instances (not just names).
+
+- **Navigation:** Incremental improvements, particularly to URL generation.
+
+- **MVC:** You can now configure the initial set of MVC event listeners in the
+ configuration file; the MVC stack now detects generic HTTP responses when
+ detecting event short circuiting; the default ExceptionStrategy now allows
+ returning JSON; opt-in translatable segment routing; many incremental
+ improvements to the AbstractRestfulController to make it more configurable and
+ extensible; the Forward plugin was refactored to no longer require a
+ ServiceLocatorAware controller, and instead receive the ControllerManager via
+ its factory.
+
+- **Paginator:** Support for TableGateway objects.
+
+- **ServiceManager:** Incremental improvements; performance optimizations;
+ delegate factories, which provide a way to write factories for objects that
+ replace a service with a decorator; "lazy" factories, allowing the ability to
+ delay factory creation invocation until the moment of first use.
+
+- **Stdlib:** Addition of a HydratorAwareInterface; creation of a
+ HydratorPluginManager.
+
+- **SOAP:** Major refactor of WSDL generation to make it more maintainable.
+
+- **Validator:** New Brazilian IBAN format for IBAN validator; validators now
+ only return unique error messages; improved Maestro detection in CreditCard
+ validator.
+
+- **Version:** use the ZF website API for finding the latest version, instead of
+ GitHub.
+
+- **View:** Many incremental improvements, primarily to helpers; deprecation of
+ the Placeholder Registry and removal of it from the implemented placeholder
+ system; new explicit factory classes for helpers that have collaborators
+ (making them easier to override/replace).
Please see [CHANGELOG.md](CHANGELOG.md).
diff --git a/vendor/zendframework/zendframework/bin/check-cs.sh b/vendor/zendframework/zendframework/bin/check-cs.sh
index 6cc200f780e6d9116dd1812d8e57576c1c4b424d..0fc3bb75b3efa2430eca0fcaefe1df0d0fe04eab 100644
--- a/vendor/zendframework/zendframework/bin/check-cs.sh
+++ b/vendor/zendframework/zendframework/bin/check-cs.sh
@@ -1,17 +1,19 @@
#!/bin/bash
-cd "$(dirname $(dirname "$0"))"
-output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 .)
-echo $output
-cs=0
-if [[ "$output" -ne "" ]];then
- cs=2
-fi
-echo "Coding standards exited with status $cs"
+libraryCS=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 ./library)
+testsCS=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 ./tests)
-if [[ "$cs" -eq "2" ]];then
- echo "Exiting with status 2 due to CS";
- exit 2;
+if [[ "$libraryCS" || "$testsCS" ]];
+then
+ echo -en '\E[31m'"$libraryCS
+$testsCS\033[1m\033[0m";
+ printf "\n";
+ echo -en '\E[31;47m'"\033[1mCoding standards check failed!\033[0m" # Red
+ printf "\n";
+ exit 2;
fi
-exit 0
+echo -en '\E[32m'"\033[1mCoding standards check passed!\033[0m" # Green
+printf "\n";
+
+echo $libraryCS$testsCS;
diff --git a/vendor/zendframework/zendframework/bin/classmap_generator.php b/vendor/zendframework/zendframework/bin/classmap_generator.php
index 088b5b0b5dd2f4b49fb5efc2040f64693c11dbc1..b4f17a3325f23451e851df9845625efff5b1f223 100755
--- a/vendor/zendframework/zendframework/bin/classmap_generator.php
+++ b/vendor/zendframework/zendframework/bin/classmap_generator.php
@@ -24,6 +24,7 @@ use Zend\Loader\StandardAutoloader;
* --append|-a Append to autoload file if it exists
* --overwrite|-w Whether or not to overwrite existing autoload
* file
+ * --ignore|-i [ <string> ] Comma-separated namespaces to ignore
*/
$zfLibraryPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';
@@ -53,6 +54,7 @@ $rules = array(
'output|o-s' => 'Where to write autoload file; if not provided, assumes "autoload_classmap.php" in library directory',
'append|a' => 'Append to autoload file if it exists',
'overwrite|w' => 'Whether or not to overwrite existing autoload file',
+ 'ignore|i-s' => 'Comma-separated namespaces to ignore',
);
try {
@@ -68,6 +70,11 @@ if ($opts->getOption('h')) {
exit(0);
}
+$ignoreNamespaces = array();
+if (isset($opts->i)) {
+ $ignoreNamespaces = explode(',', $opts->i);
+}
+
$relativePathForClassmap = '';
if (isset($opts->l)) {
if (!is_dir($opts->l)) {
@@ -157,6 +164,12 @@ foreach ($l as $file) {
$filename = $relativePathForClassmap . $filename;
foreach ($file->getClasses() as $class) {
+ foreach ($ignoreNamespaces as $ignoreNs) {
+ if ($ignoreNs == substr($class, 0, strlen($ignoreNs))) {
+ continue 2;
+ }
+ }
+
$map->{$class} = $filename;
}
}
diff --git a/vendor/zendframework/zendframework/build.xml b/vendor/zendframework/zendframework/build.xml
index 19baf9a80ad2e6724b97ef28450372357db55554..2d946f985e4ec6ba5aaab732346552564099becf 100644
--- a/vendor/zendframework/zendframework/build.xml
+++ b/vendor/zendframework/zendframework/build.xml
@@ -16,16 +16,24 @@
</target>
<target name="composer-install" description="Installs dependencies via composer install">
- <exec executable="composer" failonerror="true">
- <arg value="install" />
- <arg value="--dev" />
- <arg value="--prefer-source" />
- </exec>
+ <sequential>
+ <exec executable="composer" failonerror="true">
+ <arg value="self-update" />
+ </exec>
+ <exec executable="composer" failonerror="true">
+ <arg value="--version" />
+ </exec>
+ <exec executable="composer" failonerror="true">
+ <arg value="install" />
+ <arg value="--dev" />
+ <arg value="--prefer-source" />
+ </exec>
+ </sequential>
</target>
<target
name="tests-parallel"
- depends="prepare,composer-install"
+ depends="prepare,composer-install,get-cs-fixer"
description="Run tests for the various components in parallel"
>
<parallel threadCount="8">
@@ -102,12 +110,12 @@
</echo>
<exec
- executable="${basedir}/vendor/bin/phpunit"
- output="${basedir}/build/test-results/@{component}.log"
- error="${basedir}/build/test-results/@{component}.log"
- failonerror="true"
- append="true"
- >
+ executable="${basedir}/vendor/bin/phpunit"
+ output="${basedir}/build/test-results/@{component}.log"
+ error="${basedir}/build/test-results/@{component}.log"
+ failonerror="true"
+ append="true"
+ >
<arg value="-c" />
<arg value="${basedir}/tests/phpunit.xml.dist" />
<arg value="${basedir}/tests/ZendTest/@{component}" />
@@ -128,11 +136,7 @@
error="${basedir}/build/cs-results/check-cs.log"
failonerror="true"
append="true"
- >
- <arg value="-c" />
- <arg value="${basedir}/tests/phpunit.xml.dist" />
- <arg value="${basedir}/tests/ZendTest/@{component}" />
- </exec>
+ />
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
diff --git a/vendor/zendframework/zendframework/composer.json b/vendor/zendframework/zendframework/composer.json
index 24f48feaa576beeea817495dc00271aea4f970ad..152acf3b4702cb081164f9b21e558f1d72b8af58 100644
--- a/vendor/zendframework/zendframework/composer.json
+++ b/vendor/zendframework/zendframework/composer.json
@@ -12,16 +12,17 @@
"php": ">=5.3.3"
},
"require-dev": {
- "doctrine/common": ">=2.1",
+ "doctrine/annotations": ">=1.0",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
+ "ocramius/proxy-manager": "0.3.*",
"phpunit/PHPUnit": "3.7.*"
},
"suggest": {
- "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
- "ext-intl": "ext/intl for i18n features",
+ "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
+ "doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
"ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "pecl-weakref": "Implementation of weak references for Zend\\Stdlib\\CallbackHandler",
+ "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
"zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
@@ -88,8 +89,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php
index 3b4113528f93a62274b6213502a5b906a5d5f357..a9a54b2bb4e294fef8ddf1f1647c3d9ae3c101c4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php
@@ -9,439 +9,9 @@
namespace Zend\Authentication\Adapter;
-use stdClass;
-use Zend\Authentication\Result as AuthenticationResult;
-use Zend\Db\Adapter\Adapter as DbAdapter;
-use Zend\Db\ResultSet\ResultSet;
-use Zend\Db\Sql;
-use Zend\Db\Sql\Expression as SqlExpr;
-use Zend\Db\Sql\Predicate\Operator as SqlOp;
-
-class DbTable extends AbstractAdapter
+/**
+ * @deprecated
+ */
+class DbTable extends DbTable\CredentialTreatmentAdapter
{
-
- /**
- * Database Connection
- *
- * @var DbAdapter
- */
- protected $zendDb = null;
-
- /**
- * @var Sql\Select
- */
- protected $dbSelect = null;
-
- /**
- * $tableName - the table name to check
- *
- * @var string
- */
- protected $tableName = null;
-
- /**
- * $identityColumn - the column to use as the identity
- *
- * @var string
- */
- protected $identityColumn = null;
-
- /**
- * $credentialColumns - columns to be used as the credentials
- *
- * @var string
- */
- protected $credentialColumn = null;
-
- /**
- * $credentialTreatment - Treatment applied to the credential, such as MD5() or PASSWORD()
- *
- * @var string
- */
- protected $credentialTreatment = null;
-
- /**
- * $authenticateResultInfo
- *
- * @var array
- */
- protected $authenticateResultInfo = null;
-
- /**
- * $resultRow - Results of database authentication query
- *
- * @var array
- */
- protected $resultRow = null;
-
- /**
- * $ambiguityIdentity - Flag to indicate same Identity can be used with
- * different credentials. Default is FALSE and need to be set to true to
- * allow ambiguity usage.
- *
- * @var bool
- */
- protected $ambiguityIdentity = false;
-
- /**
- * __construct() - Sets configuration options
- *
- * @param DbAdapter $zendDb
- * @param string $tableName Optional
- * @param string $identityColumn Optional
- * @param string $credentialColumn Optional
- * @param string $credentialTreatment Optional
- * @return \Zend\Authentication\Adapter\DbTable
- */
- public function __construct(DbAdapter $zendDb, $tableName = null, $identityColumn = null,
- $credentialColumn = null, $credentialTreatment = null)
- {
- $this->zendDb = $zendDb;
-
- if (null !== $tableName) {
- $this->setTableName($tableName);
- }
-
- if (null !== $identityColumn) {
- $this->setIdentityColumn($identityColumn);
- }
-
- if (null !== $credentialColumn) {
- $this->setCredentialColumn($credentialColumn);
- }
-
- if (null !== $credentialTreatment) {
- $this->setCredentialTreatment($credentialTreatment);
- }
- }
-
- /**
- * setTableName() - set the table name to be used in the select query
- *
- * @param string $tableName
- * @return DbTable Provides a fluent interface
- */
- public function setTableName($tableName)
- {
- $this->tableName = $tableName;
- return $this;
- }
-
- /**
- * setIdentityColumn() - set the column name to be used as the identity column
- *
- * @param string $identityColumn
- * @return DbTable Provides a fluent interface
- */
- public function setIdentityColumn($identityColumn)
- {
- $this->identityColumn = $identityColumn;
- return $this;
- }
-
- /**
- * setCredentialColumn() - set the column name to be used as the credential column
- *
- * @param string $credentialColumn
- * @return DbTable Provides a fluent interface
- */
- public function setCredentialColumn($credentialColumn)
- {
- $this->credentialColumn = $credentialColumn;
- return $this;
- }
-
- /**
- * setCredentialTreatment() - allows the developer to pass a parametrized string that is
- * used to transform or treat the input credential data.
- *
- * In many cases, passwords and other sensitive data are encrypted, hashed, encoded,
- * obscured, or otherwise treated through some function or algorithm. By specifying a
- * parametrized treatment string with this method, a developer may apply arbitrary SQL
- * upon input credential data.
- *
- * Examples:
- *
- * 'PASSWORD(?)'
- * 'MD5(?)'
- *
- * @param string $treatment
- * @return DbTable Provides a fluent interface
- */
- public function setCredentialTreatment($treatment)
- {
- $this->credentialTreatment = $treatment;
- return $this;
- }
-
- /**
- * setAmbiguityIdentity() - sets a flag for usage of identical identities
- * with unique credentials. It accepts integers (0, 1) or boolean (true,
- * false) parameters. Default is false.
- *
- * @param int|bool $flag
- * @return DbTable Provides a fluent interface
- */
- public function setAmbiguityIdentity($flag)
- {
- if (is_integer($flag)) {
- $this->ambiguityIdentity = (1 === $flag ? true : false);
- } elseif (is_bool($flag)) {
- $this->ambiguityIdentity = $flag;
- }
- return $this;
- }
-
- /**
- * getAmbiguityIdentity() - returns TRUE for usage of multiple identical
- * identities with different credentials, FALSE if not used.
- *
- * @return bool
- */
- public function getAmbiguityIdentity()
- {
- return $this->ambiguityIdentity;
- }
-
- /**
- * getDbSelect() - Return the preauthentication Db Select object for userland select query modification
- *
- * @return Sql\Select
- */
- public function getDbSelect()
- {
- if ($this->dbSelect == null) {
- $this->dbSelect = new Sql\Select();
- }
- return $this->dbSelect;
- }
-
- /**
- * getResultRowObject() - Returns the result row as a stdClass object
- *
- * @param string|array $returnColumns
- * @param string|array $omitColumns
- * @return stdClass|bool
- */
- public function getResultRowObject($returnColumns = null, $omitColumns = null)
- {
- if (!$this->resultRow) {
- return false;
- }
-
- $returnObject = new stdClass();
-
- if (null !== $returnColumns) {
-
- $availableColumns = array_keys($this->resultRow);
- foreach ((array) $returnColumns as $returnColumn) {
- if (in_array($returnColumn, $availableColumns)) {
- $returnObject->{$returnColumn} = $this->resultRow[$returnColumn];
- }
- }
- return $returnObject;
-
- } elseif (null !== $omitColumns) {
-
- $omitColumns = (array) $omitColumns;
- foreach ($this->resultRow as $resultColumn => $resultValue) {
- if (!in_array($resultColumn, $omitColumns)) {
- $returnObject->{$resultColumn} = $resultValue;
- }
- }
- return $returnObject;
-
- }
-
- foreach ($this->resultRow as $resultColumn => $resultValue) {
- $returnObject->{$resultColumn} = $resultValue;
- }
- return $returnObject;
- }
-
- /**
- * This method is called to attempt an authentication. Previous to this
- * call, this adapter would have already been configured with all
- * necessary information to successfully connect to a database table and
- * attempt to find a record matching the provided identity.
- *
- * @throws Exception\RuntimeException if answering the authentication query is impossible
- * @return AuthenticationResult
- */
- public function authenticate()
- {
- $this->_authenticateSetup();
- $dbSelect = $this->_authenticateCreateSelect();
- $resultIdentities = $this->_authenticateQuerySelect($dbSelect);
-
- if (($authResult = $this->_authenticateValidateResultSet($resultIdentities)) instanceof AuthenticationResult) {
- return $authResult;
- }
-
- // At this point, ambiguity is already done. Loop, check and break on success.
- foreach ($resultIdentities as $identity) {
- $authResult = $this->_authenticateValidateResult($identity);
- if ($authResult->isValid()) {
- break;
- }
- }
-
- return $authResult;
- }
-
- /**
- * _authenticateSetup() - This method abstracts the steps involved with
- * making sure that this adapter was indeed setup properly with all
- * required pieces of information.
- *
- * @throws Exception\RuntimeException in the event that setup was not done properly
- * @return bool
- */
- protected function _authenticateSetup()
- {
- $exception = null;
-
- if ($this->tableName == '') {
- $exception = 'A table must be supplied for the DbTable authentication adapter.';
- } elseif ($this->identityColumn == '') {
- $exception = 'An identity column must be supplied for the DbTable authentication adapter.';
- } elseif ($this->credentialColumn == '') {
- $exception = 'A credential column must be supplied for the DbTable authentication adapter.';
- } elseif ($this->identity == '') {
- $exception = 'A value for the identity was not provided prior to authentication with DbTable.';
- } elseif ($this->credential === null) {
- $exception = 'A credential value was not provided prior to authentication with DbTable.';
- }
-
- if (null !== $exception) {
- throw new Exception\RuntimeException($exception);
- }
-
- $this->authenticateResultInfo = array(
- 'code' => AuthenticationResult::FAILURE,
- 'identity' => $this->identity,
- 'messages' => array()
- );
-
- return true;
- }
-
- /**
- * _authenticateCreateSelect() - This method creates a Zend\Db\Sql\Select object that
- * is completely configured to be queried against the database.
- *
- * @return Sql\Select
- */
- protected function _authenticateCreateSelect()
- {
- // build credential expression
- if (empty($this->credentialTreatment) || (strpos($this->credentialTreatment, '?') === false)) {
- $this->credentialTreatment = '?';
- }
-
- $credentialExpression = new SqlExpr(
- '(CASE WHEN ?' . ' = ' . $this->credentialTreatment . ' THEN 1 ELSE 0 END) AS ?',
- array($this->credentialColumn, $this->credential, 'zend_auth_credential_match'),
- array(SqlExpr::TYPE_IDENTIFIER, SqlExpr::TYPE_VALUE, SqlExpr::TYPE_IDENTIFIER)
- );
-
- // get select
- $dbSelect = clone $this->getDbSelect();
- $dbSelect->from($this->tableName)
- ->columns(array('*', $credentialExpression))
- ->where(new SqlOp($this->identityColumn, '=', $this->identity));
-
- return $dbSelect;
- }
-
- /**
- * _authenticateQuerySelect() - This method accepts a Zend\Db\Sql\Select object and
- * performs a query against the database with that object.
- *
- * @param Sql\Select $dbSelect
- * @throws Exception\RuntimeException when an invalid select object is encountered
- * @return array
- */
- protected function _authenticateQuerySelect(Sql\Select $dbSelect)
- {
- $sql = new Sql\Sql($this->zendDb);
- $statement = $sql->prepareStatementForSqlObject($dbSelect);
- try {
- $result = $statement->execute();
- $resultIdentities = array();
- // iterate result, most cross platform way
- foreach ($result as $row) {
- $resultIdentities[] = $row;
- }
- } catch (\Exception $e) {
- throw new Exception\RuntimeException(
- 'The supplied parameters to DbTable failed to '
- . 'produce a valid sql statement, please check table and column names '
- . 'for validity.', 0, $e
- );
- }
- return $resultIdentities;
- }
-
- /**
- * _authenticateValidateResultSet() - This method attempts to make
- * certain that only one record was returned in the resultset
- *
- * @param array $resultIdentities
- * @return bool|\Zend\Authentication\Result
- */
- protected function _authenticateValidateResultSet(array $resultIdentities)
- {
-
- if (count($resultIdentities) < 1) {
- $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND;
- $this->authenticateResultInfo['messages'][] = 'A record with the supplied identity could not be found.';
- return $this->_authenticateCreateAuthResult();
- } elseif (count($resultIdentities) > 1 && false === $this->getAmbiguityIdentity()) {
- $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_IDENTITY_AMBIGUOUS;
- $this->authenticateResultInfo['messages'][] = 'More than one record matches the supplied identity.';
- return $this->_authenticateCreateAuthResult();
- }
-
- return true;
- }
-
- /**
- * _authenticateValidateResult() - This method attempts to validate that
- * the record in the resultset is indeed a record that matched the
- * identity provided to this adapter.
- *
- * @param array $resultIdentity
- * @return AuthenticationResult
- */
- protected function _authenticateValidateResult($resultIdentity)
- {
- if ($resultIdentity['zend_auth_credential_match'] != '1') {
- $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_CREDENTIAL_INVALID;
- $this->authenticateResultInfo['messages'][] = 'Supplied credential is invalid.';
- return $this->_authenticateCreateAuthResult();
- }
-
- unset($resultIdentity['zend_auth_credential_match']);
- $this->resultRow = $resultIdentity;
-
- $this->authenticateResultInfo['code'] = AuthenticationResult::SUCCESS;
- $this->authenticateResultInfo['messages'][] = 'Authentication successful.';
- return $this->_authenticateCreateAuthResult();
- }
-
- /**
- * Creates a Zend\Authentication\Result object from the information that
- * has been collected during the authenticate() attempt.
- *
- * @return AuthenticationResult
- */
- protected function _authenticateCreateAuthResult()
- {
- return new AuthenticationResult(
- $this->authenticateResultInfo['code'],
- $this->authenticateResultInfo['identity'],
- $this->authenticateResultInfo['messages']
- );
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..02e0bbbcc757802453871141299e7bedc52b30ae
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
@@ -0,0 +1,377 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter\DbTable;
+
+
+use stdClass;
+use Zend\Authentication\Result as AuthenticationResult;
+use Zend\Authentication\Adapter\AbstractAdapter as BaseAdapter;
+use Zend\Db\Adapter\Adapter as DbAdapter;
+use Zend\Db\Sql;
+
+abstract class AbstractAdapter extends BaseAdapter
+{
+ /**
+ * Database Connection
+ *
+ * @var DbAdapter
+ */
+ protected $zendDb = null;
+
+ /**
+ * @var Sql\Select
+ */
+ protected $dbSelect = null;
+ /**
+ * $tableName - the table name to check
+ *
+ * @var string
+ */
+ protected $tableName = null;
+
+ /**
+ * $identityColumn - the column to use as the identity
+ *
+ * @var string
+ */
+ protected $identityColumn = null;
+
+ /**
+ * $credentialColumns - columns to be used as the credentials
+ *
+ * @var string
+ */
+ protected $credentialColumn = null;
+
+ /**
+ * $authenticateResultInfo
+ *
+ * @var array
+ */
+ protected $authenticateResultInfo = null;
+
+ /**
+ * $resultRow - Results of database authentication query
+ *
+ * @var array
+ */
+ protected $resultRow = null;
+
+ /**
+ * $ambiguityIdentity - Flag to indicate same Identity can be used with
+ * different credentials. Default is FALSE and need to be set to true to
+ * allow ambiguity usage.
+ *
+ * @var bool
+ */
+ protected $ambiguityIdentity = false;
+
+ /**
+ * __construct() - Sets configuration options
+ *
+ * @param DbAdapter $zendDb
+ * @param string $tableName Optional
+ * @param string $identityColumn Optional
+ * @param string $credentialColumn Optional
+ */
+ public function __construct(
+ DbAdapter $zendDb,
+ $tableName = null,
+ $identityColumn = null,
+ $credentialColumn = null
+ ) {
+ $this->zendDb = $zendDb;
+
+ if (null !== $tableName) {
+ $this->setTableName($tableName);
+ }
+
+ if (null !== $identityColumn) {
+ $this->setIdentityColumn($identityColumn);
+ }
+
+ if (null !== $credentialColumn) {
+ $this->setCredentialColumn($credentialColumn);
+ }
+ }
+
+ /**
+ * setTableName() - set the table name to be used in the select query
+ *
+ * @param string $tableName
+ * @return DbTable Provides a fluent interface
+ */
+ public function setTableName($tableName)
+ {
+ $this->tableName = $tableName;
+ return $this;
+ }
+
+ /**
+ * setIdentityColumn() - set the column name to be used as the identity column
+ *
+ * @param string $identityColumn
+ * @return DbTable Provides a fluent interface
+ */
+ public function setIdentityColumn($identityColumn)
+ {
+ $this->identityColumn = $identityColumn;
+ return $this;
+ }
+
+ /**
+ * setCredentialColumn() - set the column name to be used as the credential column
+ *
+ * @param string $credentialColumn
+ * @return DbTable Provides a fluent interface
+ */
+ public function setCredentialColumn($credentialColumn)
+ {
+ $this->credentialColumn = $credentialColumn;
+ return $this;
+ }
+
+ /**
+ * setAmbiguityIdentity() - sets a flag for usage of identical identities
+ * with unique credentials. It accepts integers (0, 1) or boolean (true,
+ * false) parameters. Default is false.
+ *
+ * @param int|bool $flag
+ * @return DbTable Provides a fluent interface
+ */
+ public function setAmbiguityIdentity($flag)
+ {
+ if (is_int($flag)) {
+ $this->ambiguityIdentity = (1 === $flag ? true : false);
+ } elseif (is_bool($flag)) {
+ $this->ambiguityIdentity = $flag;
+ }
+ return $this;
+ }
+
+ /**
+ * getAmbiguityIdentity() - returns TRUE for usage of multiple identical
+ * identities with different credentials, FALSE if not used.
+ *
+ * @return bool
+ */
+ public function getAmbiguityIdentity()
+ {
+ return $this->ambiguityIdentity;
+ }
+
+ /**
+ * getDbSelect() - Return the preauthentication Db Select object for userland select query modification
+ *
+ * @return Sql\Select
+ */
+ public function getDbSelect()
+ {
+ if ($this->dbSelect == null) {
+ $this->dbSelect = new Sql\Select();
+ }
+ return $this->dbSelect;
+ }
+
+ /**
+ * getResultRowObject() - Returns the result row as a stdClass object
+ *
+ * @param string|array $returnColumns
+ * @param string|array $omitColumns
+ * @return stdClass|bool
+ */
+ public function getResultRowObject($returnColumns = null, $omitColumns = null)
+ {
+ if (!$this->resultRow) {
+ return false;
+ }
+
+ $returnObject = new stdClass();
+
+ if (null !== $returnColumns) {
+
+ $availableColumns = array_keys($this->resultRow);
+ foreach ((array) $returnColumns as $returnColumn) {
+ if (in_array($returnColumn, $availableColumns)) {
+ $returnObject->{$returnColumn} = $this->resultRow[$returnColumn];
+ }
+ }
+ return $returnObject;
+
+ } elseif (null !== $omitColumns) {
+
+ $omitColumns = (array) $omitColumns;
+ foreach ($this->resultRow as $resultColumn => $resultValue) {
+ if (!in_array($resultColumn, $omitColumns)) {
+ $returnObject->{$resultColumn} = $resultValue;
+ }
+ }
+ return $returnObject;
+
+ }
+
+ foreach ($this->resultRow as $resultColumn => $resultValue) {
+ $returnObject->{$resultColumn} = $resultValue;
+ }
+ return $returnObject;
+ }
+
+ /**
+ * This method is called to attempt an authentication. Previous to this
+ * call, this adapter would have already been configured with all
+ * necessary information to successfully connect to a database table and
+ * attempt to find a record matching the provided identity.
+ *
+ * @throws Exception\RuntimeException if answering the authentication query is impossible
+ * @return AuthenticationResult
+ */
+ public function authenticate()
+ {
+ $this->authenticateSetup();
+ $dbSelect = $this->authenticateCreateSelect();
+ $resultIdentities = $this->authenticateQuerySelect($dbSelect);
+
+ if (($authResult = $this->authenticateValidateResultSet($resultIdentities)) instanceof AuthenticationResult) {
+ return $authResult;
+ }
+
+ // At this point, ambiguity is already done. Loop, check and break on success.
+ foreach ($resultIdentities as $identity) {
+ $authResult = $this->authenticateValidateResult($identity);
+ if ($authResult->isValid()) {
+ break;
+ }
+ }
+
+ return $authResult;
+ }
+
+ /**
+ * _authenticateValidateResult() - This method attempts to validate that
+ * the record in the resultset is indeed a record that matched the
+ * identity provided to this adapter.
+ *
+ * @param array $resultIdentity
+ * @return AuthenticationResult
+ */
+ abstract protected function authenticateValidateResult($resultIdentity);
+
+ /**
+ * _authenticateCreateSelect() - This method creates a Zend\Db\Sql\Select object that
+ * is completely configured to be queried against the database.
+ *
+ * @return Sql\Select
+ */
+ abstract protected function authenticateCreateSelect();
+
+ /**
+ * _authenticateSetup() - This method abstracts the steps involved with
+ * making sure that this adapter was indeed setup properly with all
+ * required pieces of information.
+ *
+ * @throws Exception\RuntimeException in the event that setup was not done properly
+ * @return bool
+ */
+ protected function authenticateSetup()
+ {
+ $exception = null;
+
+ if ($this->tableName == '') {
+ $exception = 'A table must be supplied for the DbTable authentication adapter.';
+ } elseif ($this->identityColumn == '') {
+ $exception = 'An identity column must be supplied for the DbTable authentication adapter.';
+ } elseif ($this->credentialColumn == '') {
+ $exception = 'A credential column must be supplied for the DbTable authentication adapter.';
+ } elseif ($this->identity == '') {
+ $exception = 'A value for the identity was not provided prior to authentication with DbTable.';
+ } elseif ($this->credential === null) {
+ $exception = 'A credential value was not provided prior to authentication with DbTable.';
+ }
+
+ if (null !== $exception) {
+ throw new Exception\RuntimeException($exception);
+ }
+
+ $this->authenticateResultInfo = array(
+ 'code' => AuthenticationResult::FAILURE,
+ 'identity' => $this->identity,
+ 'messages' => array()
+ );
+
+ return true;
+ }
+
+ /**
+ * _authenticateQuerySelect() - This method accepts a Zend\Db\Sql\Select object and
+ * performs a query against the database with that object.
+ *
+ * @param Sql\Select $dbSelect
+ * @throws Exception\RuntimeException when an invalid select object is encountered
+ * @return array
+ */
+ protected function authenticateQuerySelect(Sql\Select $dbSelect)
+ {
+ $sql = new Sql\Sql($this->zendDb);
+ $statement = $sql->prepareStatementForSqlObject($dbSelect);
+ try {
+ $result = $statement->execute();
+ $resultIdentities = array();
+ // iterate result, most cross platform way
+ foreach ($result as $row) {
+ $resultIdentities[] = $row;
+ }
+ } catch (\Exception $e) {
+ throw new Exception\RuntimeException(
+ 'The supplied parameters to DbTable failed to '
+ . 'produce a valid sql statement, please check table and column names '
+ . 'for validity.', 0, $e
+ );
+ }
+ return $resultIdentities;
+ }
+
+ /**
+ * _authenticateValidateResultSet() - This method attempts to make
+ * certain that only one record was returned in the resultset
+ *
+ * @param array $resultIdentities
+ * @return bool|\Zend\Authentication\Result
+ */
+ protected function authenticateValidateResultSet(array $resultIdentities)
+ {
+
+ if (count($resultIdentities) < 1) {
+ $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND;
+ $this->authenticateResultInfo['messages'][] = 'A record with the supplied identity could not be found.';
+ return $this->authenticateCreateAuthResult();
+ } elseif (count($resultIdentities) > 1 && false === $this->getAmbiguityIdentity()) {
+ $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_IDENTITY_AMBIGUOUS;
+ $this->authenticateResultInfo['messages'][] = 'More than one record matches the supplied identity.';
+ return $this->authenticateCreateAuthResult();
+ }
+
+ return true;
+ }
+
+ /**
+ * Creates a Zend\Authentication\Result object from the information that
+ * has been collected during the authenticate() attempt.
+ *
+ * @return AuthenticationResult
+ */
+ protected function authenticateCreateAuthResult()
+ {
+ return new AuthenticationResult(
+ $this->authenticateResultInfo['code'],
+ $this->authenticateResultInfo['identity'],
+ $this->authenticateResultInfo['messages']
+ );
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..4378a53982d9c5c2c4f0540fa50434a138cdd19e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter\DbTable;
+
+use Zend\Authentication\Result as AuthenticationResult;
+use Zend\Db\Adapter\Adapter as DbAdapter;
+use Zend\Db\Sql;
+use Zend\Db\Sql\Predicate\Operator as SqlOp;
+
+class CallbackCheckAdapter extends AbstractAdapter
+{
+ /**
+ * $credentialValidationCallback - This overrides the Treatment usage to provide a callback
+ * that allows for validation to happen in code
+ *
+ * @var callable
+ */
+ protected $credentialValidationCallback = null;
+
+ /**
+ * __construct() - Sets configuration options
+ *
+ * @param DbAdapter $zendDb
+ * @param string $tableName Optional
+ * @param string $identityColumn Optional
+ * @param string $credentialColumn Optional
+ * @param callable $credentialValidationCallback Optional
+ */
+ public function __construct(
+ DbAdapter $zendDb,
+ $tableName = null,
+ $identityColumn = null,
+ $credentialColumn = null,
+ $credentialValidationCallback = null
+ ) {
+ parent::__construct($zendDb, $tableName, $identityColumn, $credentialColumn);
+
+ if (null !== $credentialValidationCallback) {
+ $this->setCredentialValidationCallback($credentialValidationCallback);
+ } else {
+ $this->setCredentialValidationCallback(function($a, $b) {
+ return $a === $b;
+ });
+ }
+ }
+
+ /**
+ * setCredentialValidationCallback() - allows the developer to use a callback as a way of checking the
+ * credential.
+ *
+ * @param callable $validationCallback
+ * @return DbTable
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setCredentialValidationCallback($validationCallback)
+ {
+ if (!is_callable($validationCallback)) {
+ throw new Exception\InvalidArgumentException('Invalid callback provided');
+ }
+ $this->credentialValidationCallback = $validationCallback;
+ return $this;
+ }
+
+ /**
+ * _authenticateCreateSelect() - This method creates a Zend\Db\Sql\Select object that
+ * is completely configured to be queried against the database.
+ *
+ * @return Sql\Select
+ */
+ protected function authenticateCreateSelect()
+ {
+ // get select
+ $dbSelect = clone $this->getDbSelect();
+ $dbSelect->from($this->tableName)
+ ->columns(array(Sql\Select::SQL_STAR))
+ ->where(new SqlOp($this->identityColumn, '=', $this->identity));
+
+ return $dbSelect;
+ }
+
+ /**
+ * _authenticateValidateResult() - This method attempts to validate that
+ * the record in the resultset is indeed a record that matched the
+ * identity provided to this adapter.
+ *
+ * @param array $resultIdentity
+ * @return AuthenticationResult
+ */
+ protected function authenticateValidateResult($resultIdentity)
+ {
+ try {
+ $callbackResult = call_user_func($this->credentialValidationCallback, $resultIdentity[$this->credentialColumn], $this->credential);
+ } catch (\Exception $e) {
+ $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_UNCATEGORIZED;
+ $this->authenticateResultInfo['messages'][] = $e->getMessage();
+ return $this->authenticateCreateAuthResult();
+ }
+ if ($callbackResult !== true) {
+ $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_CREDENTIAL_INVALID;
+ $this->authenticateResultInfo['messages'][] = 'Supplied credential is invalid.';
+ return $this->authenticateCreateAuthResult();
+ }
+
+ $this->resultRow = $resultIdentity;
+
+ $this->authenticateResultInfo['code'] = AuthenticationResult::SUCCESS;
+ $this->authenticateResultInfo['messages'][] = 'Authentication successful.';
+ return $this->authenticateCreateAuthResult();
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..10b07211a50f35e767f81a4caeb99a238a880c11
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter\DbTable;
+
+use Zend\Authentication\Result as AuthenticationResult;
+use Zend\Db\Adapter\Adapter as DbAdapter;
+use Zend\Db\Sql;
+use Zend\Db\Sql\Expression as SqlExpr;
+use Zend\Db\Sql\Predicate\Operator as SqlOp;
+
+class CredentialTreatmentAdapter extends AbstractAdapter
+{
+ /**
+ * $credentialTreatment - Treatment applied to the credential, such as MD5() or PASSWORD()
+ *
+ * @var string
+ */
+ protected $credentialTreatment = null;
+
+ /**
+ * __construct() - Sets configuration options
+ *
+ * @param DbAdapter $zendDb
+ * @param string $tableName Optional
+ * @param string $identityColumn Optional
+ * @param string $credentialColumn Optional
+ * @param string $credentialTreatment Optional
+ */
+ public function __construct(
+ DbAdapter $zendDb,
+ $tableName = null,
+ $identityColumn = null,
+ $credentialColumn = null,
+ $credentialTreatment = null
+ ) {
+ parent::__construct($zendDb, $tableName, $identityColumn, $credentialColumn);
+
+ if (null !== $credentialTreatment) {
+ $this->setCredentialTreatment($credentialTreatment);
+ }
+ }
+
+ /**
+ * setCredentialTreatment() - allows the developer to pass a parametrized string that is
+ * used to transform or treat the input credential data.
+ *
+ * In many cases, passwords and other sensitive data are encrypted, hashed, encoded,
+ * obscured, or otherwise treated through some function or algorithm. By specifying a
+ * parametrized treatment string with this method, a developer may apply arbitrary SQL
+ * upon input credential data.
+ *
+ * Examples:
+ *
+ * 'PASSWORD(?)'
+ * 'MD5(?)'
+ *
+ * @param string $treatment
+ * @return DbTable Provides a fluent interface
+ */
+ public function setCredentialTreatment($treatment)
+ {
+ $this->credentialTreatment = $treatment;
+ return $this;
+ }
+
+ /**
+ * _authenticateCreateSelect() - This method creates a Zend\Db\Sql\Select object that
+ * is completely configured to be queried against the database.
+ *
+ * @return Sql\Select
+ */
+ protected function authenticateCreateSelect()
+ {
+ // build credential expression
+ if (empty($this->credentialTreatment) || (strpos($this->credentialTreatment, '?') === false)) {
+ $this->credentialTreatment = '?';
+ }
+
+ $credentialExpression = new SqlExpr(
+ '(CASE WHEN ?' . ' = ' . $this->credentialTreatment . ' THEN 1 ELSE 0 END) AS ?',
+ array($this->credentialColumn, $this->credential, 'zend_auth_credential_match'),
+ array(SqlExpr::TYPE_IDENTIFIER, SqlExpr::TYPE_VALUE, SqlExpr::TYPE_IDENTIFIER)
+ );
+
+ // get select
+ $dbSelect = clone $this->getDbSelect();
+ $dbSelect->from($this->tableName)
+ ->columns(array('*', $credentialExpression))
+ ->where(new SqlOp($this->identityColumn, '=', $this->identity));
+
+ return $dbSelect;
+ }
+
+ /**
+ * _authenticateValidateResult() - This method attempts to validate that
+ * the record in the resultset is indeed a record that matched the
+ * identity provided to this adapter.
+ *
+ * @param array $resultIdentity
+ * @return AuthenticationResult
+ */
+ protected function authenticateValidateResult($resultIdentity)
+ {
+ if ($resultIdentity['zend_auth_credential_match'] != '1') {
+ $this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_CREDENTIAL_INVALID;
+ $this->authenticateResultInfo['messages'][] = 'Supplied credential is invalid.';
+ return $this->authenticateCreateAuthResult();
+ }
+
+ unset($resultIdentity['zend_auth_credential_match']);
+ $this->resultRow = $resultIdentity;
+
+ $this->authenticateResultInfo['code'] = AuthenticationResult::SUCCESS;
+ $this->authenticateResultInfo['messages'][] = 'Authentication successful.';
+ return $this->authenticateCreateAuthResult();
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..c205de32f8b1a79701e08b6050c6db6844f8c1c4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter\DbTable\Exception;
+
+use Zend\Authentication\Adapter\Exception\ExceptionInterface as Exception;
+
+interface ExceptionInterface extends Exception
+{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..76c620593ca07ee54f09dcff226ef00af26a348b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter\DbTable\Exception;
+
+use Zend\Authentication\Adapter\Exception;
+
+class InvalidArgumentException
+ extends Exception\InvalidArgumentException
+ implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..332a477fad640889247598ee20020a86680fe7d6
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter\DbTable\Exception;
+
+use Zend\Authentication\Adapter\Exception;
+
+class RuntimeException extends Exception\RuntimeException implements
+ ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
index f99b6269cccf2ea945328674becc5991e5d898b7..13d7fdbd80befa755d81457c736a7668b782888c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
@@ -84,7 +84,7 @@ class Http implements AdapterInterface
/**
* Nonce timeout period
*
- * @var integer
+ * @var int
*/
protected $nonceTimeout;
@@ -491,7 +491,7 @@ class Http implements AdapterInterface
&& !is_array($result)
&& $this->_secureStringCompare($result, $creds[1])
) {
- $identity = array('username'=>$creds[0], 'realm'=>$this->realm);
+ $identity = array('username' => $creds[0], 'realm' => $this->realm);
return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
} elseif (is_array($result)) {
return new Authentication\Result(Authentication\Result::SUCCESS, $result);
@@ -583,7 +583,7 @@ class Http implements AdapterInterface
// If our digest matches the client's let them in, otherwise return
// a 401 code and exit to prevent access to the protected resource.
if ($this->_secureStringCompare($digest, $data['response'])) {
- $identity = array('username'=>$data['username'], 'realm'=>$data['realm']);
+ $identity = array('username' => $data['username'], 'realm' => $data['realm']);
return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
index 22c945caac4b7c8af0285a3a7e8b30f964aa67d2..b5a9dd9b23a13b5d8f1ea978e0d25b3c5d5bea96 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
@@ -9,9 +9,9 @@
namespace Zend\Authentication\Adapter\Http;
+use Zend\Authentication\Result as AuthResult;
use Zend\Crypt\Password\Apache as ApachePassword;
use Zend\Stdlib\ErrorHandler;
-use Zend\Authentication\Result as AuthResult;
/**
* Apache Authentication Resolver
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php
index 93b02bd7195abf9fe3b0dd6045b8b5314e0cb79a..074d3b93a0ad850925f063de577906bcba56877f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php
@@ -416,7 +416,9 @@ class Ldap extends AbstractAdapter
$returnObject = new stdClass();
- $omitAttribs = array_map('strtolower', $omitAttribs);
+ $returnAttribs = array_map('strtolower', $returnAttribs);
+ $omitAttribs = array_map('strtolower', $omitAttribs);
+ $returnAttribs = array_diff($returnAttribs, $omitAttribs);
$entry = $this->getLdap()->getEntry($this->authenticatedDn, $returnAttribs, true);
foreach ($entry as $attr => $value) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
index 5e316318561617207f134b82b898cae8d879a616..3c90d9ce4a5024264ecf38dfad3e549e42dfb497 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
@@ -77,7 +77,7 @@ class Result
if ($code < self::FAILURE_UNCATEGORIZED) {
$code = self::FAILURE;
- } elseif ($code > self::SUCCESS ) {
+ } elseif ($code > self::SUCCESS) {
$code = 1;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php
index 2f6c9f6c22e8cf6ee94f55bdeeaa9693f4121e16..e04da6e9af41b79b15c7acec308d31b85e9ec012 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php
@@ -9,8 +9,8 @@
namespace Zend\Authentication\Storage;
-use Zend\Stdlib\PriorityQueue;
use Zend\Authentication\Storage\StorageInterface;
+use Zend\Stdlib\PriorityQueue;
class Chain implements StorageInterface
{
@@ -33,7 +33,7 @@ class Chain implements StorageInterface
/**
* @param StorageInterface $storage
- * @param integer $priority
+ * @param int $priority
*/
public function add(StorageInterface $storage, $priority = 1)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json b/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
index c8fab06210bbdd8382be8dec3c75dd26fcabeb3a..79eea9108a039fb66e43c2e1a2ba40ff5d57fbd7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
@@ -23,8 +23,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
index 39cc9bb1cdd6b11dfa67814bbed5d0c23704a2e5..5fe07f63a469f1a763d001ba15518ec7b6ff7413 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
@@ -128,7 +128,7 @@ abstract class Barcode
$renderer = static::makeRenderer($renderer, $rendererConfig);
} catch (Exception\ExceptionInterface $e) {
if ($automaticRenderError && !($e instanceof Exception\RendererCreationException)) {
- $barcode = static::makeBarcode('error', array( 'text' => $e->getMessage() ));
+ $barcode = static::makeBarcode('error', array('text' => $e->getMessage()));
$renderer = static::makeRenderer($renderer, array());
} else {
throw $e;
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php
index ffc4774f7fc8ee22b34995acd75e467ca0b7ed56..9ca423d6c566d3263316dd85467699d7d12c1390 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php
@@ -39,50 +39,50 @@ abstract class AbstractObject implements ObjectInterface
/**
* Height of the object
- * @var integer
+ * @var int
*/
protected $height = null;
/**
* Width of the object
- * @var integer
+ * @var int
*/
protected $width = null;
/**
* Height of the bar
- * @var integer
+ * @var int
*/
protected $barHeight = 50;
/**
* Width of a thin bar
- * @var integer
+ * @var int
*/
protected $barThinWidth = 1;
/**
* Width of a thick bar
- * @var integer
+ * @var int
*/
protected $barThickWidth = 3;
/**
* Factor to multiply bar and font measure
* (barHeight, barThinWidth, barThickWidth & fontSize)
- * @var integer
+ * @var int
*/
protected $factor = 1;
/**
* Font and bars color of the object
- * @var integer
+ * @var int
*/
protected $foreColor = 0x000000;
/**
* Background color of the object
- * @var integer
+ * @var int
*/
protected $backgroundColor = 0xFFFFFF;
@@ -113,14 +113,14 @@ abstract class AbstractObject implements ObjectInterface
/**
* Offset from the top the object
* (calculated from the orientation)
- * @var integer
+ * @var int
*/
protected $offsetTop = null;
/**
* Offset from the left the object
* (calculated from the orientation)
- * @var integer
+ * @var int
*/
protected $offsetLeft = null;
@@ -146,7 +146,7 @@ abstract class AbstractObject implements ObjectInterface
* Font resource
* - integer (1 to 5): corresponds to GD included fonts
* - string: corresponds to path of a TTF font
- * @var integer|string
+ * @var int|string
*/
protected $font = null;
@@ -170,7 +170,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Fix barcode length (numeric or string like 'even')
- * @var integer | string
+ * @var int | string
*/
protected $barcodeLength = null;
@@ -272,9 +272,9 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set height of the barcode bar
- * @param integer $value
+ * @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBarHeight($value)
{
@@ -289,7 +289,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get height of the barcode bar
- * @return integer
+ * @return int
*/
public function getBarHeight()
{
@@ -298,9 +298,9 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set thickness of thin bar
- * @param integer $value
+ * @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBarThinWidth($value)
{
@@ -315,7 +315,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get thickness of thin bar
- * @return integer
+ * @return int
*/
public function getBarThinWidth()
{
@@ -324,9 +324,9 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set thickness of thick bar
- * @param integer $value
+ * @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBarThickWidth($value)
{
@@ -341,7 +341,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get thickness of thick bar
- * @return integer
+ * @return int
*/
public function getBarThickWidth()
{
@@ -353,7 +353,7 @@ abstract class AbstractObject implements ObjectInterface
* thinBarWidth - thickBarWidth - barHeight - fontSize
* @param float $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setFactor($value)
{
@@ -369,7 +369,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get factor applying to
* thinBarWidth - thickBarWidth - barHeight - fontSize
- * @return integer
+ * @return int
*/
public function getFactor()
{
@@ -380,7 +380,7 @@ abstract class AbstractObject implements ObjectInterface
* Set color of the barcode and text
* @param string $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setForeColor($value)
{
@@ -398,7 +398,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve color of the barcode and text
- * @return integer
+ * @return int
*/
public function getForeColor()
{
@@ -407,9 +407,9 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set the color of the background
- * @param integer $value
+ * @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBackgroundColor($value)
{
@@ -427,7 +427,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve background color of the image
- * @return integer
+ * @return int
*/
public function getBackgroundColor()
{
@@ -490,7 +490,7 @@ abstract class AbstractObject implements ObjectInterface
* Set orientation of barcode and text
* @param float $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setOrientation($value)
{
@@ -602,7 +602,7 @@ abstract class AbstractObject implements ObjectInterface
* of the characters to the position of the bars
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setStretchText($value)
{
@@ -651,7 +651,7 @@ abstract class AbstractObject implements ObjectInterface
* added to the barcode text
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setWithChecksumInText($value)
{
@@ -675,9 +675,9 @@ abstract class AbstractObject implements ObjectInterface
* Set the font:
* - if integer between 1 and 5, use gd built-in fonts
* - if string, $value is assumed to be the path to a TTF font
- * @param integer|string $value
+ * @param int|string $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setFont($value)
{
@@ -706,7 +706,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve the font
- * @return integer|string
+ * @return int|string
*/
public function getFont()
{
@@ -717,7 +717,7 @@ abstract class AbstractObject implements ObjectInterface
* Set the size of the font in case of TTF
* @param float $value
* @return \Zend\Barcode\Object\ObjectInterface
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setFontSize($value)
{
@@ -748,7 +748,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Quiet zone before first bar
* and after the last bar
- * @return integer
+ * @return int
*/
public function getQuietZone()
{
@@ -780,7 +780,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Add a polygon drawing instruction in the set of instructions
* @param array $points
- * @param integer $color
+ * @param int $color
* @param bool $filled
*/
protected function addPolygon(array $points, $color = null, $filled = true)
@@ -802,7 +802,7 @@ abstract class AbstractObject implements ObjectInterface
* @param float $size
* @param array $position
* @param string $font
- * @param integer $color
+ * @param int $color
* @param string $alignment
* @param float $orientation
*/
@@ -845,7 +845,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Check if a text is really provided to barcode
* @return void
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkText($value = null)
{
@@ -862,10 +862,10 @@ abstract class AbstractObject implements ObjectInterface
/**
* Check the ratio between the thick and the thin bar
- * @param integer $min
- * @param integer $max
+ * @param int $min
+ * @param int $max
* @return void
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkRatio($min = 2, $max = 3)
{
@@ -883,7 +883,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Drawing with an angle is just allow TTF font
* @return void
- * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
+ * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkFontAndOrientation()
{
@@ -897,7 +897,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Width of the result image
* (before any rotation)
- * @return integer
+ * @return int
*/
protected function calculateWidth()
{
@@ -908,13 +908,13 @@ abstract class AbstractObject implements ObjectInterface
/**
* Calculate the width of the barcode
- * @return integer
+ * @return int
*/
abstract protected function calculateBarcodeWidth();
/**
* Height of the result object
- * @return integer
+ * @return int
*/
protected function calculateHeight()
{
@@ -925,7 +925,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Height of the barcode
- * @return integer
+ * @return int
*/
protected function calculateBarcodeHeight()
{
@@ -941,7 +941,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get height of the result object
* @param bool $recalculate
- * @return integer
+ * @return int
*/
public function getHeight($recalculate = false)
{
@@ -956,7 +956,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get width of the result object
* @param bool $recalculate
- * @return integer
+ * @return int
*/
public function getWidth($recalculate = false)
{
@@ -1036,7 +1036,7 @@ abstract class AbstractObject implements ObjectInterface
$y2 = $y1 * cos($this->orientation / 180 * pi())
+ $x1 * sin($this->orientation / 180 * pi())
+ $this->getOffsetTop();
- return array(intval($x2) , intval($y2));
+ return array(intval($x2), intval($y2));
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php
index f7cc159ff42f3bf144d793e2ca4fd20c367e9cec..b6e14b2cfe1a98f108f5852d0f202efa7d3221aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php
@@ -32,7 +32,7 @@ class Codabar extends AbstractObject
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -66,9 +66,9 @@ class Codabar extends AbstractObject
$barcodeChar = str_split($this->codingMap[$char]);
foreach ($barcodeChar as $c) {
// visible, width, top, length
- $barcodeTable[] = array($c , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($c, $this->barThinWidth, 0, 1);
}
- $barcodeTable[] = array(0 , $this->barThinWidth);
+ $barcodeTable[] = array(0, $this->barThinWidth);
}
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php
index 8ffcd30595b32782e437b5f265857754c9d86d9a..fb9dad1294c0ba3fa1828067e0bb565211f476d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php
@@ -115,7 +115,7 @@ class Code128 extends AbstractObject
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php
index 2e4f0e8f6651534c98a16b6cb4ee22df47128923..2efbb58f6fb10e353d6460d6b44adfdd7db32304 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php
@@ -35,7 +35,7 @@ class Code25 extends AbstractObject
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -66,12 +66,12 @@ class Code25 extends AbstractObject
$barcodeTable = array();
// Start character (30301)
- $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth);
+ $barcodeTable[] = array(1, $this->barThickWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThickWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth);
$text = str_split($this->getText());
foreach ($text as $char) {
@@ -79,17 +79,17 @@ class Code25 extends AbstractObject
foreach ($barcodeChar as $c) {
/* visible, width, top, length */
$width = $c ? $this->barThickWidth : $this->barThinWidth;
- $barcodeTable[] = array(1 , $width , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth);
+ $barcodeTable[] = array(1, $width, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth);
}
}
// Stop character (30103)
- $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1);
+ $barcodeTable[] = array(1, $this->barThickWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThickWidth, 0, 1);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php
index 6f79f8e1fd4ab16fb67b85b289516b38ddd15135..e02d38b7c9b3a51faae38fcac87ac87f5f8579d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php
@@ -51,7 +51,7 @@ class Code25interleaved extends Code25
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -98,14 +98,14 @@ class Code25interleaved extends Code25
$barWidth = (substr($this->codingMap[$char2], $ibar, 1))
? $this->barThickWidth
: $this->barThinWidth;
- $barcodeTable[] = array(0, $barWidth, 0 , 1);
+ $barcodeTable[] = array(0, $barWidth, 0, 1);
}
}
// Stop character (100)
- $barcodeTable[] = array(1 , $this->barThickWidth, 0, 1);
- $barcodeTable[] = array(0 , $this->barThinWidth, 0, 1);
- $barcodeTable[] = array(1 , $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThickWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php
index 89d3bc15795cf28109b64321087fad0da0a3c512..e626c9f5af3c697a0202fbc6c25477fff84698a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php
@@ -137,7 +137,7 @@ class Code39 extends AbstractObject
$barcodeTable[] = array((int) $visible, $width, 0, 1);
$visible = ! $visible;
}
- $barcodeTable[] = array(0 , $this->barThinWidth);
+ $barcodeTable[] = array(0, $this->barThinWidth);
}
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php
index 7d9d8997d82cd5cc2420b001ac2306c8ec490945..0abd26c540cdccccf0d6e799bcbd1142ecf73dd9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php
@@ -61,7 +61,7 @@ class Ean13 extends AbstractObject
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -90,9 +90,9 @@ class Ean13 extends AbstractObject
$height = ($this->drawText) ? 1.1 : 1;
// Start character (101)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
$textTable = str_split($this->getText());
$parity = $this->parities[$textTable[0]];
@@ -101,29 +101,29 @@ class Ean13 extends AbstractObject
for ($i = 1; $i < 7; $i++) {
$bars = str_split($this->codingMap[$parity[$i - 1]][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
// Middle character (01010)
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
// Second part
for ($i = 7; $i < 13; $i++) {
$bars = str_split($this->codingMap['C'][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
// Stop character (101)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php
index 84396f290927b596eba962576e0bf78ee6a8a74a..2f265ef5eb9f6dee2f13db1f82b78d756593bb1c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php
@@ -39,7 +39,7 @@ class Ean5 extends Ean13
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -59,11 +59,11 @@ class Ean5 extends Ean13
$barcodeTable = array();
// Start character (01011)
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
$firstCharacter = true;
$textTable = str_split($this->getText());
@@ -74,12 +74,12 @@ class Ean5 extends Ean13
$firstCharacter = false;
} else {
// Intermediate character (01)
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
}
$bars = str_split($this->codingMap[$this->getParity($i)][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php
index 0e89abf9db994b684e08f7f374a0c97221f65772..cbdeba9e240b07e3f17e52bc62fefcd4c4f2331a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php
@@ -29,7 +29,7 @@ class Ean8 extends Ean13
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -51,9 +51,9 @@ class Ean8 extends Ean13
$height = ($this->drawText) ? 1.1 : 1;
// Start character (101)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
$textTable = str_split($this->getText());
@@ -61,29 +61,29 @@ class Ean8 extends Ean13
for ($i = 0; $i < 4; $i++) {
$bars = str_split($this->codingMap['A'][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
// Middle character (01010)
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
// Second part
for ($i = 4; $i < 8; $i++) {
$bars = str_split($this->codingMap['C'][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
// Stop character (101)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php
index 3c81f1660c4bae7df38c8691512d837e96622e18..ee7e00e2db9babd7df6f1809d915bd5b4543adb8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php
@@ -27,7 +27,7 @@ class Error extends AbstractObject
/**
* Height is forced
* @param bool $recalculate
- * @return integer
+ * @return int
*/
public function getHeight($recalculate = false)
{
@@ -37,7 +37,7 @@ class Error extends AbstractObject
/**
* Width is forced
* @param bool $recalculate
- * @return integer
+ * @return int
*/
public function getWidth($recalculate = false)
{
@@ -52,8 +52,8 @@ class Error extends AbstractObject
public function draw()
{
$this->instructions = array();
- $this->addText('ERROR:', 10, array(5 , 18), $this->font, 0, 'left');
- $this->addText($this->text, 10, array(5 , 32), $this->font, 0, 'left');
+ $this->addText('ERROR:', 10, array(5, 18), $this->font, 0, 'left');
+ $this->addText($this->text, 10, array(5, 32), $this->font, 0, 'left');
return $this->instructions;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php
index 4f334434f06f0ad428874c78b5f120243935fe91..4e7268cf4917f80fea2d42e343042da906cabb11 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php
@@ -40,7 +40,7 @@ class Identcode extends Code25interleaved
* Check allowed characters
* @param string $value
* @return string
- * @throw Exception
+ * @throws Exception
*/
public function validateText($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php
index 14b04321d725c433400c120373f32684a3054a63..3fe4500edb370ad25207f2a9a3c860cd07abd2b3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php
@@ -50,47 +50,47 @@ interface ObjectInterface
/**
* Set height of the barcode bar
- * @param integer $value
+ * @param int $value
* @return ObjectInterface
*/
public function setBarHeight($value);
/**
* Get height of the barcode bar
- * @return integer
+ * @return int
*/
public function getBarHeight();
/**
* Set thickness of thin bar
- * @param integer $value
+ * @param int $value
* @return ObjectInterface
*/
public function setBarThinWidth($value);
/**
* Get thickness of thin bar
- * @return integer
+ * @return int
*/
public function getBarThinWidth();
/**
* Set thickness of thick bar
- * @param integer $value
+ * @param int $value
* @return ObjectInterface
*/
public function setBarThickWidth($value);
/**
* Get thickness of thick bar
- * @return integer
+ * @return int
*/
public function getBarThickWidth();
/**
* Set factor applying to
* thinBarWidth - thickBarWidth - barHeight - fontSize
- * @param integer $value
+ * @param int $value
* @return ObjectInterface
*/
public function setFactor($value);
@@ -98,7 +98,7 @@ interface ObjectInterface
/**
* Get factor applying to
* thinBarWidth - thickBarWidth - barHeight - fontSize
- * @return integer
+ * @return int
*/
public function getFactor();
@@ -111,20 +111,20 @@ interface ObjectInterface
/**
* Retrieve color of the barcode and text
- * @return integer
+ * @return int
*/
public function getForeColor();
/**
* Set the color of the background
- * @param integer $value
+ * @param int $value
* @return ObjectInterface
*/
public function setBackgroundColor($value);
/**
* Retrieve background color of the image
- * @return integer
+ * @return int
*/
public function getBackgroundColor();
@@ -249,14 +249,14 @@ interface ObjectInterface
* Set the font:
* - if integer between 1 and 5, use gd built-in fonts
* - if string, $value is assumed to be the path to a TTF font
- * @param integer|string $value
+ * @param int|string $value
* @return ObjectInterface
*/
public function setFont($value);
/**
* Retrieve the font
- * @return integer|string
+ * @return int|string
*/
public function getFont();
@@ -276,7 +276,7 @@ interface ObjectInterface
/**
* Quiet zone before first bar
* and after the last bar
- * @return integer
+ * @return int
*/
public function getQuietZone();
@@ -295,14 +295,14 @@ interface ObjectInterface
/**
* Get height of the result object
* @param bool $recalculate
- * @return integer
+ * @return int
*/
public function getHeight($recalculate = false);
/**
* Get width of the result object
* @param bool $recalculate
- * @return integer
+ * @return int
*/
public function getWidth($recalculate = false);
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php
index a9d02ea512481775787af953f275cd0bd19c2709..4f3c9f1d17e610862b27cd9a6a343c38bb304e98 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php
@@ -49,7 +49,7 @@ class Postnet extends AbstractObject
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -76,21 +76,21 @@ class Postnet extends AbstractObject
$barcodeTable = array();
// Start character (1)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
// Text to encode
$textTable = str_split($this->getText());
foreach ($textTable as $char) {
$bars = str_split($this->codingMap[$char]);
foreach ($bars as $b) {
- $barcodeTable[] = array(1 , $this->barThinWidth , 0.5 - $b * 0.5 , 1);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0.5 - $b * 0.5, 1);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
}
}
// Stop character (1)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php
index 47a3861f69b63bbb7516c5b621c66be32dc7283b..ed38d7b857074faae2b3e4c4100d6d580b0ed028 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php
@@ -65,7 +65,7 @@ class Royalmail extends AbstractObject
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -92,21 +92,21 @@ class Royalmail extends AbstractObject
$barcodeTable = array();
// Start character (1)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 5/8);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 5/8);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
// Text to encode
$textTable = str_split($this->getText());
foreach ($textTable as $char) {
$bars = str_split($this->codingMap[$char]);
foreach ($bars as $b) {
- $barcodeTable[] = array(1 , $this->barThinWidth , ($b > 1 ? 3/8 : 0) , ($b % 2 ? 5/8 : 1));
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, ($b > 1 ? 3/8 : 0), ($b % 2 ? 5/8 : 1));
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
}
}
// Stop character (1)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php
index 7940dc62af4998221b8e770ab751284d29588706..ba701395b09b90296e6ee6b2068b8c0a57fd643d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php
@@ -28,7 +28,7 @@ class Upca extends Ean13
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -50,51 +50,51 @@ class Upca extends Ean13
$height = ($this->drawText) ? 1.1 : 1;
// Start character (101)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
$textTable = str_split($this->getText());
// First character
$bars = str_split($this->codingMap['A'][$textTable[0]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, $height);
}
// First part
for ($i = 1; $i < 6; $i++) {
$bars = str_split($this->codingMap['A'][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
// Middle character (01010)
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
// Second part
for ($i = 6; $i < 11; $i++) {
$bars = str_split($this->codingMap['C'][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
// Last character
$bars = str_split($this->codingMap['C'][$textTable[11]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, $height);
}
// Stop character (101)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php
index 3648b232010a4cf363df772ef7b5237a9256aff7..228f8693d572c7f5b4a025888a3ff824677a8a3d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php
@@ -68,7 +68,7 @@ class Upce extends Ean13
/**
* Width of the barcode (in pixels)
- * @return integer
+ * @return int
*/
protected function calculateBarcodeWidth()
{
@@ -89,9 +89,9 @@ class Upce extends Ean13
$height = ($this->drawText) ? 1.1 : 1;
// Start character (101)
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
$textTable = str_split($this->getText());
$system = 0;
@@ -104,17 +104,17 @@ class Upce extends Ean13
for ($i = 1; $i < 7; $i++) {
$bars = str_split($this->codingMap[$parity[$i - 1]][$textTable[$i]]);
foreach ($bars as $b) {
- $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1);
+ $barcodeTable[] = array($b, $this->barThinWidth, 0, 1);
}
}
// Stop character (10101)
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height);
- $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(0, $this->barThinWidth, 0, $height);
+ $barcodeTable[] = array(1, $this->barThinWidth, 0, $height);
return $barcodeTable;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php
index f27d7d1c489b29bf0e463ce5f6d02839e4a4b4ed..185bf2541e3383d2f169c4dbc2e0ab2d381f79e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php
@@ -40,25 +40,25 @@ abstract class AbstractRenderer implements RendererInterface
/**
* Offset of the barcode from the top of the rendering resource
- * @var integer
+ * @var int
*/
protected $topOffset = 0;
/**
* Offset of the barcode from the left of the rendering resource
- * @var integer
+ * @var int
*/
protected $leftOffset = 0;
/**
* Horizontal position of the barcode in the rendering resource
- * @var integer
+ * @var int
*/
protected $horizontalPosition = 'left';
/**
* Vertical position of the barcode in the rendering resource
- * @var integer
+ * @var int
*/
protected $verticalPosition = 'top';
@@ -146,7 +146,7 @@ abstract class AbstractRenderer implements RendererInterface
/**
* Manually adjust top position
- * @param integer $value
+ * @param int $value
* @return AbstractRenderer
* @throws Exception\OutOfRangeException
*/
@@ -163,7 +163,7 @@ abstract class AbstractRenderer implements RendererInterface
/**
* Retrieve vertical adjustment
- * @return integer
+ * @return int
*/
public function getTopOffset()
{
@@ -172,7 +172,7 @@ abstract class AbstractRenderer implements RendererInterface
/**
* Manually adjust left position
- * @param integer $value
+ * @param int $value
* @return AbstractRenderer
* @throws Exception\OutOfRangeException
*/
@@ -189,7 +189,7 @@ abstract class AbstractRenderer implements RendererInterface
/**
* Retrieve vertical adjustment
- * @return integer
+ * @return int
*/
public function getLeftOffset()
{
@@ -215,7 +215,7 @@ abstract class AbstractRenderer implements RendererInterface
*/
public function setHorizontalPosition($value)
{
- if (!in_array($value, array('left' , 'center' , 'right'))) {
+ if (!in_array($value, array('left', 'center', 'right'))) {
throw new Exception\UnexpectedValueException(
"Invalid barcode position provided must be 'left', 'center' or 'right'"
);
@@ -241,7 +241,7 @@ abstract class AbstractRenderer implements RendererInterface
*/
public function setVerticalPosition($value)
{
- if (!in_array($value, array('top' , 'middle' , 'bottom'))) {
+ if (!in_array($value, array('top', 'middle', 'bottom'))) {
throw new Exception\UnexpectedValueException(
"Invalid barcode position provided must be 'top', 'middle' or 'bottom'"
);
@@ -463,7 +463,7 @@ abstract class AbstractRenderer implements RendererInterface
/**
* Draw a polygon in the rendering resource
* @param array $points
- * @param integer $color
+ * @param int $color
* @param bool $filled
*/
abstract protected function drawPolygon($points, $color, $filled = true);
@@ -474,7 +474,7 @@ abstract class AbstractRenderer implements RendererInterface
* @param float $size
* @param array $position
* @param string $font
- * @param integer $color
+ * @param int $color
* @param string $alignment
* @param float $orientation
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php
index 687be735204fa2c623088f8ec5553743ce8816df..2d03291866006b4ab9a13cc6731094dfd3c71caa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php
@@ -39,25 +39,25 @@ class Image extends AbstractRenderer
/**
* Resource for the font and bars color of the image
- * @var integer
+ * @var int
*/
protected $imageForeColor = null;
/**
* Resource for the background color of the image
- * @var integer
+ * @var int
*/
protected $imageBackgroundColor = null;
/**
* Height of the rendered image wanted by user
- * @var integer
+ * @var int
*/
protected $userHeight = 0;
/**
* Width of the rendered image wanted by user
- * @var integer
+ * @var int
*/
protected $userWidth = 0;
@@ -79,7 +79,7 @@ class Image extends AbstractRenderer
/**
* Set height of the result image
*
- * @param null|integer $value
+ * @param null|int $value
* @throws Exception\OutOfRangeException
* @return Image
*/
@@ -324,7 +324,7 @@ class Image extends AbstractRenderer
* Draw a polygon in the image resource
*
* @param array $points
- * @param integer $color
+ * @param int $color
* @param bool $filled
*/
protected function drawPolygon($points, $color, $filled = true)
@@ -357,7 +357,7 @@ class Image extends AbstractRenderer
* @param float $size
* @param array $position
* @param string $font
- * @param integer $color
+ * @param int $color
* @param string $alignment
* @param float $orientation
* @throws Exception\RuntimeException
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php
index 1df6ee5c807e262610ac88968c3b49142b67dd41..c87bd2d53288791cf062833b4395415e3b2629cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php
@@ -27,7 +27,7 @@ class Pdf extends AbstractRenderer
/**
* Page number in PDF resource
- * @var integer
+ * @var int
*/
protected $page = 0;
@@ -41,7 +41,7 @@ class Pdf extends AbstractRenderer
* Set a PDF resource to draw the barcode inside
*
* @param PdfDocument $pdf
- * @param integer $page
+ * @param int $page
* @return Pdf
*/
public function setResource(PdfDocument $pdf, $page = 0)
@@ -98,7 +98,7 @@ class Pdf extends AbstractRenderer
/**
* Draw a polygon in the rendering resource
* @param array $points
- * @param integer $color
+ * @param int $color
* @param bool $filled
*/
protected function drawPolygon($points, $color, $filled = true)
@@ -138,13 +138,13 @@ class Pdf extends AbstractRenderer
/**
* Draw a polygon in the rendering resource
- * @param string $text
- * @param float $size
- * @param array $position
- * @param string $font
- * @param integer $color
- * @param string $alignment
- * @param float $orientation
+ * @param string $text
+ * @param float $size
+ * @param array $position
+ * @param string $font
+ * @param int $color
+ * @param string $alignment
+ * @param float $orientation
*/
protected function drawText(
$text,
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php
index 619d609c656b28c88944b2dff5f80fcd7321c8de..4da43624d5c6f1414a88337021f42cb30b7f8c25 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php
@@ -52,27 +52,27 @@ interface RendererInterface
/**
* Manually adjust top position
- * @param integer $value
+ * @param int $value
* @return RendererInterface
*/
public function setTopOffset($value);
/**
* Retrieve vertical adjustment
- * @return integer
+ * @return int
*/
public function getTopOffset();
/**
* Manually adjust left position
- * @param integer $value
+ * @param int $value
* @return RendererInterface
*/
public function setLeftOffset($value);
/**
* Retrieve vertical adjustment
- * @return integer
+ * @return int
*/
public function getLeftOffset();
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php
index a583a3b84afcb47e63e25339f6e91671c60a1ebb..53ecbbb5053043447fff162db2b6ed2c4fb857a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php
@@ -33,19 +33,19 @@ class Svg extends AbstractRenderer
/**
* Height of the rendered image wanted by user
- * @var integer
+ * @var int
*/
protected $userHeight = 0;
/**
* Width of the rendered image wanted by user
- * @var integer
+ * @var int
*/
protected $userWidth = 0;
/**
* Set height of the result image
- * @param null|integer $value
+ * @param null|int $value
* @throws Exception\OutOfRangeException
* @return Svg
*/
@@ -191,7 +191,7 @@ class Svg extends AbstractRenderer
protected function createElement($tagName, $attributes = array(), $textContent = null)
{
$element = $this->resource->createElement($tagName);
- foreach ($attributes as $k =>$v) {
+ foreach ($attributes as $k => $v) {
$element->setAttribute($k, $v);
}
if ($textContent !== null) {
@@ -287,7 +287,7 @@ class Svg extends AbstractRenderer
* Draw a polygon in the svg resource
*
* @param array $points
- * @param integer $color
+ * @param int $color
* @param bool $filled
*/
protected function drawPolygon($points, $color, $filled = true)
@@ -319,7 +319,7 @@ class Svg extends AbstractRenderer
* @param float $size
* @param array $position
* @param string $font
- * @param integer $color
+ * @param int $color
* @param string $alignment
* @param float $orientation
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json b/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json
index f9f8002d993ce5d16b18529e58353b835d23ea5a..798049be2964e8072810e0833703d199eab8f358 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json
@@ -25,8 +25,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php
index df18f1d35bd0498f763a5516880133e143821302..a57ae05ede6933b162e44d9ef21a10919264c617 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php
@@ -57,10 +57,10 @@ class CaptureCache extends AbstractPattern
}
$path = $this->pageId2Path($pageId);
- $file = $path . \DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
+ $file = $path . DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
- $this->createDirectoryStructure($publicDir . \DIRECTORY_SEPARATOR . $path);
- $this->putFileContent($publicDir . \DIRECTORY_SEPARATOR . $file, $content);
+ $this->createDirectoryStructure($publicDir . DIRECTORY_SEPARATOR . $path);
+ $this->putFileContent($publicDir . DIRECTORY_SEPARATOR . $file, $content);
}
/**
@@ -83,8 +83,8 @@ class CaptureCache extends AbstractPattern
}
$file = $publicDir
- . \DIRECTORY_SEPARATOR . $this->pageId2Path($pageId)
- . \DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
+ . DIRECTORY_SEPARATOR . $this->pageId2Path($pageId)
+ . DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
if (file_exists($file)) {
ErrorHandler::start();
@@ -118,8 +118,8 @@ class CaptureCache extends AbstractPattern
}
$file = $publicDir
- . \DIRECTORY_SEPARATOR . $this->pageId2Path($pageId)
- . \DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
+ . DIRECTORY_SEPARATOR . $this->pageId2Path($pageId)
+ . DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
return file_exists($file);
}
@@ -144,8 +144,8 @@ class CaptureCache extends AbstractPattern
}
$file = $publicDir
- . \DIRECTORY_SEPARATOR . $this->pageId2Path($pageId)
- . \DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
+ . DIRECTORY_SEPARATOR . $this->pageId2Path($pageId)
+ . DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
if (file_exists($file)) {
ErrorHandler::start();
@@ -231,8 +231,8 @@ class CaptureCache extends AbstractPattern
}
// convert requested "/" to the valid local directory separator
- if ('/' != \DIRECTORY_SEPARATOR) {
- $path = str_replace('/', \DIRECTORY_SEPARATOR, $path);
+ if ('/' != DIRECTORY_SEPARATOR) {
+ $path = str_replace('/', DIRECTORY_SEPARATOR, $path);
}
return $path;
@@ -259,7 +259,7 @@ class CaptureCache extends AbstractPattern
ErrorHandler::start();
$umask = ($umask !== false) ? umask($umask) : false;
- $rs = file_put_contents($file, $data, $locking ? \LOCK_EX : 0);
+ $rs = file_put_contents($file, $data, $locking ? LOCK_EX : 0);
if ($umask) {
umask($umask);
}
@@ -348,7 +348,7 @@ class CaptureCache extends AbstractPattern
// make all missing path parts
foreach ($parts as $part) {
- $path.= \DIRECTORY_SEPARATOR . $part;
+ $path.= DIRECTORY_SEPARATOR . $part;
// create a single directory, set and reset umask immediately
$umask = ($umask !== false) ? umask($umask) : false;
@@ -377,4 +377,23 @@ class CaptureCache extends AbstractPattern
ErrorHandler::stop();
}
+
+ /**
+ * Returns the generated file name.
+ *
+ * @param null|string $pageId
+ * @return string
+ */
+ public function getFilename($pageId = null)
+ {
+ if ($pageId === null) {
+ $pageId = $this->detectPageId();
+ }
+
+ $publicDir = $this->getOptions()->getPublicDir();
+ $path = $this->pageId2Path($pageId);
+ $file = $path . DIRECTORY_SEPARATOR . $this->pageId2Filename($pageId);
+
+ return $publicDir . $file;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php
index b692a4739b507bad4a79c1bb3bcccff24bb7f211..f9a9f469fb97dd58566048ae2da5b24d1238cb2a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php
@@ -654,7 +654,7 @@ class PatternOptions extends AbstractOptions
);
}
- $this->publicDir = rtrim(realpath($publicDir), \DIRECTORY_SEPARATOR);
+ $this->publicDir = rtrim(realpath($publicDir), DIRECTORY_SEPARATOR);
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..992151373e7dd43aa77213ebfa1fc6a86bf926d3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Cache\Service;
+
+use Zend\Cache\StorageFactory;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Storage cache factory for multiple caches.
+ */
+class StorageCacheAbstractServiceFactory implements AbstractFactoryInterface
+{
+ /**
+ * @var array
+ */
+ protected $config;
+
+ /**
+ * Configuration key for cache objects
+ *
+ * @var string
+ */
+ protected $configKey = 'caches';
+
+ /**
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return bool
+ */
+ public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $config = $this->getConfig($services);
+ if (empty($config)) {
+ return false;
+ }
+
+ return (isset($config[$requestedName]) && is_array($config[$requestedName]));
+ }
+
+ /**
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return \Zend\Cache\Storage\StorageInterface
+ */
+ public function createServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $config = $this->getConfig($services);
+ $config = $config[$requestedName];
+ return StorageFactory::factory($config);
+ }
+
+ /**
+ * Retrieve cache configuration, if any
+ *
+ * @param ServiceLocatorInterface $services
+ * @return array
+ */
+ protected function getConfig(ServiceLocatorInterface $services)
+ {
+ if ($this->config !== null) {
+ return $this->config;
+ }
+
+ if (!$services->has('Config')) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $config = $services->get('Config');
+ if (!isset($config[$this->configKey])) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $this->config = $config[$this->configKey];
+ return $this->config;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php
index 88c13d9dffc8f5aed5681ada575d36be655f9a65..745ca022cf166ee3609acd79f6d05b8296bb5b97 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php
@@ -9,9 +9,9 @@
namespace Zend\Cache\Service;
+use Zend\Cache\StorageFactory;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Cache\StorageFactory;
/**
* Storage cache factory.
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
index 0071edf8cf261cd9e8e208425ff8f07e018c33c9..9e20d58ae5d5385bbae4ce9c208bb7147945aaae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
@@ -74,7 +74,7 @@ abstract class AbstractZendServer extends AbstractAdapter
$result = array();
$prefixL = strlen($prefix);
foreach ($fetch as $k => & $v) {
- $result[ substr($k, $prefixL) ] = $v;
+ $result[substr($k, $prefixL)] = $v;
}
return $result;
@@ -152,7 +152,7 @@ abstract class AbstractZendServer extends AbstractAdapter
$result = array();
$prefixL = strlen($prefix);
foreach ($fetch as $internalKey => $value) {
- $result[ substr($internalKey, $prefixL) ] = array();
+ $result[substr($internalKey, $prefixL)] = array();
}
return $result;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php
index 79abe13522eddc6b727e82ebcb6ccd5672a0ae4b..2196ff5f43e3f1ddd5118022e3df2978343c52ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php
@@ -142,7 +142,7 @@ class Apc extends AbstractAdapter implements
$pattern = '/^' . preg_quote($prefix, '/') . '/';
}
- $baseIt = new BaseApcIterator('user', $pattern, 0, 1, \APC_LIST_ACTIVE);
+ $baseIt = new BaseApcIterator('user', $pattern, 0, 1, APC_LIST_ACTIVE);
return new ApcIterator($this, $baseIt, $prefix);
}
@@ -176,7 +176,7 @@ class Apc extends AbstractAdapter implements
$options = $this->getOptions();
$prefix = $namespace . $options->getNamespaceSeparator();
$pattern = '/^' . preg_quote($prefix, '/') . '/';
- return apc_delete(new BaseApcIterator('user', $pattern, 0, 1, \APC_LIST_ACTIVE));
+ return apc_delete(new BaseApcIterator('user', $pattern, 0, 1, APC_LIST_ACTIVE));
}
/* ClearByPrefixInterface */
@@ -198,7 +198,7 @@ class Apc extends AbstractAdapter implements
$namespace = $options->getNamespace();
$nsPrefix = ($namespace === '') ? '' : $namespace . $options->getNamespaceSeparator();
$pattern = '/^' . preg_quote($nsPrefix . $prefix, '/') . '/';
- return apc_delete(new BaseApcIterator('user', $pattern, 0, 1, \APC_LIST_ACTIVE));
+ return apc_delete(new BaseApcIterator('user', $pattern, 0, 1, APC_LIST_ACTIVE));
}
/* reading */
@@ -255,7 +255,7 @@ class Apc extends AbstractAdapter implements
$prefixL = strlen($prefix);
$result = array();
foreach ($fetch as $internalKey => & $value) {
- $result[ substr($internalKey, $prefixL) ] = $value;
+ $result[substr($internalKey, $prefixL)] = $value;
}
return $result;
@@ -328,9 +328,9 @@ class Apc extends AbstractAdapter implements
if (!apc_exists($internalKey)) {
$metadata = false;
} else {
- $format = \APC_ITER_ALL ^ \APC_ITER_VALUE ^ \APC_ITER_TYPE ^ \APC_ITER_REFCOUNT;
+ $format = APC_ITER_ALL ^ APC_ITER_VALUE ^ APC_ITER_TYPE ^ APC_ITER_REFCOUNT;
$regexp = '/^' . preg_quote($internalKey, '/') . '$/';
- $it = new BaseApcIterator('user', $regexp, $format, 100, \APC_LIST_ACTIVE);
+ $it = new BaseApcIterator('user', $regexp, $format, 100, APC_LIST_ACTIVE);
$metadata = $it->current();
}
@@ -367,8 +367,8 @@ class Apc extends AbstractAdapter implements
$prefix = $namespace . $options->getNamespaceSeparator();
$pattern = '/^' . preg_quote($prefix, '/') . '(' . implode('|', $keysRegExp) . ')' . '$/';
}
- $format = \APC_ITER_ALL ^ \APC_ITER_VALUE ^ \APC_ITER_TYPE ^ \APC_ITER_REFCOUNT;
- $it = new BaseApcIterator('user', $pattern, $format, 100, \APC_LIST_ACTIVE);
+ $format = APC_ITER_ALL ^ APC_ITER_VALUE ^ APC_ITER_TYPE ^ APC_ITER_REFCOUNT;
+ $it = new BaseApcIterator('user', $pattern, $format, 100, APC_LIST_ACTIVE);
$result = array();
$prefixL = strlen($prefix);
foreach ($it as $internalKey => $metadata) {
@@ -378,7 +378,7 @@ class Apc extends AbstractAdapter implements
}
$this->normalizeMetadata($metadata);
- $result[ substr($internalKey, $prefixL) ] = & $metadata;
+ $result[substr($internalKey, $prefixL)] = & $metadata;
}
return $result;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php
index ba3e9df194156fce4a8d4b4fa2f65b43b3d74eec..d2ed44ec1f5c016726806cebc4bc1bbb897c1d8b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php
@@ -104,7 +104,7 @@ class Filesystem extends AbstractAdapter implements
$dir = $this->getOptions()->getCacheDir();
$clearFolder = null;
$clearFolder = function ($dir) use (& $clearFolder, $flags) {
- $it = new GlobIterator($dir . \DIRECTORY_SEPARATOR . '*', $flags);
+ $it = new GlobIterator($dir . DIRECTORY_SEPARATOR . '*', $flags);
foreach ($it as $pathname) {
if ($it->isDir()) {
$clearFolder($pathname);
@@ -140,8 +140,8 @@ class Filesystem extends AbstractAdapter implements
$flags = GlobIterator::SKIP_DOTS | GlobIterator::CURRENT_AS_FILEINFO;
$path = $options->getCacheDir()
- . str_repeat(\DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
- . \DIRECTORY_SEPARATOR . $prefix . '*.dat';
+ . str_repeat(DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
+ . DIRECTORY_SEPARATOR . $prefix . '*.dat';
$glob = new GlobIterator($path, $flags);
$time = time();
$ttl = $options->getTtl();
@@ -188,8 +188,8 @@ class Filesystem extends AbstractAdapter implements
$flags = GlobIterator::SKIP_DOTS | GlobIterator::CURRENT_AS_PATHNAME;
$path = $options->getCacheDir()
- . str_repeat(\DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
- . \DIRECTORY_SEPARATOR . $prefix . '*';
+ . str_repeat(DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
+ . DIRECTORY_SEPARATOR . $prefix . '*';
$glob = new GlobIterator($path, $flags);
ErrorHandler::start();
@@ -226,8 +226,8 @@ class Filesystem extends AbstractAdapter implements
$flags = GlobIterator::SKIP_DOTS | GlobIterator::CURRENT_AS_PATHNAME;
$path = $options->getCacheDir()
- . str_repeat(\DIRECTORY_SEPARATOR . $nsPrefix . '*', $options->getDirLevel())
- . \DIRECTORY_SEPARATOR . $nsPrefix . $prefix . '*';
+ . str_repeat(DIRECTORY_SEPARATOR . $nsPrefix . '*', $options->getDirLevel())
+ . DIRECTORY_SEPARATOR . $nsPrefix . $prefix . '*';
$glob = new GlobIterator($path, $flags);
ErrorHandler::start();
@@ -315,8 +315,8 @@ class Filesystem extends AbstractAdapter implements
$flags = GlobIterator::SKIP_DOTS | GlobIterator::CURRENT_AS_PATHNAME;
$path = $options->getCacheDir()
- . str_repeat(\DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
- . \DIRECTORY_SEPARATOR . $prefix . '*.tag';
+ . str_repeat(DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
+ . DIRECTORY_SEPARATOR . $prefix . '*.tag';
$glob = new GlobIterator($path, $flags);
foreach ($glob as $pathname) {
@@ -355,8 +355,8 @@ class Filesystem extends AbstractAdapter implements
$namespace = $options->getNamespace();
$prefix = ($namespace === '') ? '' : $namespace . $options->getNamespaceSeparator();
$path = $options->getCacheDir()
- . str_repeat(\DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
- . \DIRECTORY_SEPARATOR . $prefix . '*.dat';
+ . str_repeat(DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
+ . DIRECTORY_SEPARATOR . $prefix . '*.dat';
return new FilesystemIterator($this, $path, $prefix);
}
@@ -1219,8 +1219,8 @@ class Filesystem extends AbstractAdapter implements
protected function rmDir($dir, $prefix)
{
$glob = glob(
- $dir . \DIRECTORY_SEPARATOR . $prefix . '*',
- \GLOB_ONLYDIR | \GLOB_NOESCAPE | \GLOB_NOSORT
+ $dir . DIRECTORY_SEPARATOR . $prefix . '*',
+ GLOB_ONLYDIR | GLOB_NOESCAPE | GLOB_NOSORT
);
if (!$glob) {
// On some systems glob returns false even on empty result
@@ -1254,7 +1254,7 @@ class Filesystem extends AbstractAdapter implements
$options = $this->getOptions();
$namespace = $options->getNamespace();
$prefix = ($namespace === '') ? '' : $namespace . $options->getNamespaceSeparator();
- $path = $options->getCacheDir() . \DIRECTORY_SEPARATOR;
+ $path = $options->getCacheDir() . DIRECTORY_SEPARATOR;
$level = $options->getDirLevel();
$fileSpecId = $path . $prefix . $normalizedKey . '/' . $level;
@@ -1263,7 +1263,7 @@ class Filesystem extends AbstractAdapter implements
// create up to 256 directories per directory level
$hash = md5($normalizedKey);
for ($i = 0, $max = ($level * 2); $i < $max; $i+= 2) {
- $path .= $prefix . $hash[$i] . $hash[$i+1] . \DIRECTORY_SEPARATOR;
+ $path .= $prefix . $hash[$i] . $hash[$i+1] . DIRECTORY_SEPARATOR;
}
}
@@ -1333,14 +1333,14 @@ class Filesystem extends AbstractAdapter implements
}
if ($nonBlocking) {
- $lock = flock($fp, \LOCK_SH | \LOCK_NB, $wouldblock);
+ $lock = flock($fp, LOCK_SH | LOCK_NB, $wouldblock);
if ($wouldblock) {
fclose($fp);
ErrorHandler::stop();
return;
}
} else {
- $lock = flock($fp, \LOCK_SH);
+ $lock = flock($fp, LOCK_SH);
}
if (!$lock) {
@@ -1353,7 +1353,7 @@ class Filesystem extends AbstractAdapter implements
$res = stream_get_contents($fp);
if ($res === false) {
- flock($fp, \LOCK_UN);
+ flock($fp, LOCK_UN);
fclose($fp);
$err = ErrorHandler::stop();
throw new Exception\RuntimeException(
@@ -1361,7 +1361,7 @@ class Filesystem extends AbstractAdapter implements
);
}
- flock($fp, \LOCK_UN);
+ flock($fp, LOCK_UN);
fclose($fp);
// if file locking disabled -> file_get_contents can be used
@@ -1456,7 +1456,7 @@ class Filesystem extends AbstractAdapter implements
// make all missing path parts
foreach ($parts as $part) {
- $path.= \DIRECTORY_SEPARATOR . $part;
+ $path.= DIRECTORY_SEPARATOR . $part;
// create a single directory, set and reset umask immediately
$umask = ($umask !== false) ? umask($umask) : false;
@@ -1536,7 +1536,7 @@ class Filesystem extends AbstractAdapter implements
throw new Exception\RuntimeException("chmod('{$file}', 0{$oct}) failed", 0, $err);
}
- if (!flock($fp, \LOCK_EX | \LOCK_NB, $wouldblock)) {
+ if (!flock($fp, LOCK_EX | LOCK_NB, $wouldblock)) {
fclose($fp);
$err = ErrorHandler::stop();
if ($wouldblock) {
@@ -1547,27 +1547,27 @@ class Filesystem extends AbstractAdapter implements
}
if (fwrite($fp, $data) === false) {
- flock($fp, \LOCK_UN);
+ flock($fp, LOCK_UN);
fclose($fp);
$err = ErrorHandler::stop();
throw new Exception\RuntimeException("Error writing file '{$file}'", 0, $err);
}
if (!ftruncate($fp, strlen($data))) {
- flock($fp, \LOCK_UN);
+ flock($fp, LOCK_UN);
fclose($fp);
$err = ErrorHandler::stop();
throw new Exception\RuntimeException("Error truncating file '{$file}'", 0, $err);
}
- flock($fp, \LOCK_UN);
+ flock($fp, LOCK_UN);
fclose($fp);
// else -> file_put_contents can be used
} else {
$flags = 0;
if ($locking) {
- $flags = $flags | \LOCK_EX;
+ $flags = $flags | LOCK_EX;
}
$umask = ($umask !== false) ? umask($umask) : false;
@@ -1600,7 +1600,7 @@ class Filesystem extends AbstractAdapter implements
*
* @param string $file
* @return void
- * @throw RuntimeException
+ * @throws RuntimeException
*/
protected function unlink($file)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
index 1d64f2d6bcf3b1694b21b9f76d250d7bf2b83c32..9dec56c3872359fb92e1423c233b0ae3623b4dec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
@@ -140,7 +140,7 @@ class FilesystemOptions extends AdapterOptions
);
}
- $cacheDir = rtrim(realpath($cacheDir), \DIRECTORY_SEPARATOR);
+ $cacheDir = rtrim(realpath($cacheDir), DIRECTORY_SEPARATOR);
} else {
$cacheDir = sys_get_temp_dir();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php
index a4892a98bf7075ebe96c033ac7c5d16b51d27072..34c0a52cb0c8d758f4a72f3ae695bbae1a4bfa08 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php
@@ -33,7 +33,7 @@ class Memcached extends AbstractAdapter implements
/**
* Has this instance be initialized
*
- * @var boolean
+ * @var bool
*/
protected $initialized = false;
@@ -261,7 +261,7 @@ class Memcached extends AbstractAdapter implements
$tmp = array();
$nsPrefixLength = strlen($this->namespacePrefix);
foreach ($result as $internalKey => & $value) {
- $tmp[ substr($internalKey, $nsPrefixLength) ] = & $value;
+ $tmp[substr($internalKey, $nsPrefixLength)] = & $value;
}
$result = $tmp;
}
@@ -353,7 +353,7 @@ class Memcached extends AbstractAdapter implements
$tmp = array();
$nsPrefixLength = strlen($this->namespacePrefix);
foreach (array_keys($result) as $internalKey) {
- $tmp[ substr($internalKey, $nsPrefixLength) ] = array();
+ $tmp[substr($internalKey, $nsPrefixLength)] = array();
}
$result = $tmp;
} else {
@@ -400,7 +400,7 @@ class Memcached extends AbstractAdapter implements
$namespacedKeyValuePairs = array();
foreach ($normalizedKeyValuePairs as $normalizedKey => & $value) {
- $namespacedKeyValuePairs[ $this->namespacePrefix . $normalizedKey ] = & $value;
+ $namespacedKeyValuePairs[$this->namespacePrefix . $normalizedKey] = & $value;
}
if (!$memc->setMulti($namespacedKeyValuePairs, $expiration)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
index 8c35e036b6e7e0782b9a5852994b3a9e2e1f756b..898e2c06586f4314e2924970ef58b2e0be04aabc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
@@ -32,7 +32,7 @@ class MemcachedResourceManager
* Check if a resource exists
*
* @param string $id
- * @return boolean
+ * @return bool
*/
public function hasResource($id)
{
@@ -93,7 +93,7 @@ class MemcachedResourceManager
{
$id = (string) $id;
- if ( !($resource instanceof MemcachedResource) ) {
+ if (!($resource instanceof MemcachedResource)) {
if ($resource instanceof Traversable) {
$resource = ArrayUtils::iteratorToArray($resource);
} elseif (!is_array($resource)) {
@@ -247,7 +247,7 @@ class MemcachedResourceManager
$constants = $reflection->getConstants();
foreach ($constants as $constName => $constValue) {
if (substr($constName, 0, 4) == 'OPT_') {
- $libOptions[ $constValue ] = $resource->getOption($constValue);
+ $libOptions[$constValue] = $resource->getOption($constValue);
}
}
return $libOptions;
@@ -282,14 +282,14 @@ class MemcachedResourceManager
throw new Exception\RuntimeException("No resource with id '{$id}'");
}
- $constValue = $this->normalizeLibOptionKey($key);
+ $this->normalizeLibOptionKey($key);
$resource = & $this->resources[$id];
if ($resource instanceof MemcachedResource) {
- return $resource->getOption($constValue);
+ return $resource->getOption($key);
}
- return isset($resource['lib_options'][$constValue]) ? $resource['lib_options'][$constValue] : null;
+ return isset($resource['lib_options'][$key]) ? $resource['lib_options'][$key] : null;
}
/**
@@ -455,7 +455,7 @@ class MemcachedResourceManager
$result = array();
foreach ($servers as $server) {
$this->normalizeServer($server);
- $result[ $server['host'] . ':' . $server['port'] ] = $server;
+ $result[$server['host'] . ':' . $server['port']] = $server;
}
$servers = array_values($result);
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php
index 83e3a9c86780ceacd904869b0fcc073e752fdeb9..f0f6a1ac2bfb2cc435b32c8b6ece031ab8c72ee8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php
@@ -311,7 +311,7 @@ class Memory extends AbstractAdapter implements
if ($success) {
$data = & $this->data[$ns][$normalizedKey];
$ttl = $options->getTtl();
- if ($ttl && microtime(true) >= ($data[1] + $ttl) ) {
+ if ($ttl && microtime(true) >= ($data[1] + $ttl)) {
$success = false;
}
}
@@ -346,7 +346,7 @@ class Memory extends AbstractAdapter implements
$result = array();
foreach ($normalizedKeys as $normalizedKey) {
if (isset($data[$normalizedKey])) {
- if (!$ttl || $now < ($data[$normalizedKey][1] + $ttl) ) {
+ if (!$ttl || $now < ($data[$normalizedKey][1] + $ttl)) {
$result[$normalizedKey] = $data[$normalizedKey][0];
}
}
@@ -371,7 +371,7 @@ class Memory extends AbstractAdapter implements
// check if expired
$ttl = $options->getTtl();
- if ($ttl && microtime(true) >= ($this->data[$ns][$normalizedKey][1] + $ttl) ) {
+ if ($ttl && microtime(true) >= ($this->data[$ns][$normalizedKey][1] + $ttl)) {
return false;
}
@@ -399,7 +399,7 @@ class Memory extends AbstractAdapter implements
$result = array();
foreach ($normalizedKeys as $normalizedKey) {
if (isset($data[$normalizedKey])) {
- if (!$ttl || $now < ($data[$normalizedKey][1] + $ttl) ) {
+ if (!$ttl || $now < ($data[$normalizedKey][1] + $ttl)) {
$result[] = $normalizedKey;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
new file mode 100644
index 0000000000000000000000000000000000000000..89467aca1d55200d40337a26c70b9dae4d88193c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
@@ -0,0 +1,437 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Cache\Storage\Adapter;
+
+use Redis as RedisResource;
+use RedisException as RedisResourceException;
+use stdClass;
+use Zend\Cache\Storage\Adapter\AbstractAdapter;
+use Zend\Cache\Exception;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
+use Zend\Cache\Storage\Capabilities;
+use Zend\Cache\Storage\FlushableInterface;
+use Zend\Cache\Storage\TotalSpaceCapableInterface;
+
+class Redis extends AbstractAdapter implements
+ FlushableInterface,
+ TotalSpaceCapableInterface
+{
+
+ /**
+ * Has this instance be initialized
+ *
+ * @var bool
+ */
+ protected $initialized = false;
+
+ /**
+ * The redis resource manager
+ *
+ * @var null|RedisResourceManager
+ */
+ protected $resourceManager;
+
+ /**
+ * The redis resource id
+ *
+ * @var null|string
+ */
+ protected $resourceId;
+
+ /**
+ * The namespace prefix
+ *
+ * @var string
+ */
+ protected $namespacePrefix = '';
+
+ /**
+ * Create new Adapter for redis storage
+ *
+ * @param null|array|Traversable|RedisOptions $options
+ * @see \Zend\Cache\Storage\Adapter\Abstract
+ */
+ public function __construct($options = null)
+ {
+ if (!extension_loaded('redis')) {
+ throw new Exception\ExtensionNotLoadedException("Redis extension is not loaded");
+ }
+
+ parent::__construct($options);
+
+ // reset initialized flag on update option(s)
+ $initialized = & $this->initialized;
+ $this->getEventManager()->attach('option', function ($event) use (& $initialized) {
+ $initialized = false;
+ });
+ }
+
+ /**
+ * Get Redis resource
+ *
+ * @return RedisResource
+ */
+ protected function getRedisResource()
+ {
+
+ if (!$this->initialized) {
+ $options = $this->getOptions();
+
+ // get resource manager and resource id
+ $this->resourceManager = $options->getResourceManager();
+ $this->resourceId = $options->getResourceId();
+
+ // init namespace prefix
+ $namespace = $options->getNamespace();
+ if ($namespace !== '') {
+ $this->namespacePrefix = $namespace . $options->getNamespaceSeparator();
+ } else {
+ $this->namespacePrefix = '';
+ }
+
+ // update initialized flag
+ $this->initialized = true;
+ }
+
+ return $this->resourceManager->getResource($this->resourceId);
+ }
+
+ /* options */
+
+ /**
+ * Set options.
+ *
+ * @param array|Traversable|RedisOptions $options
+ * @return Redis
+ * @see getOptions()
+ */
+ public function setOptions($options)
+ {
+ if (!$options instanceof RedisOptions) {
+ $options = new RedisOptions($options);
+ }
+ return parent::setOptions($options);
+ }
+
+ /**
+ * Get options.
+ *
+ * @return RedisOptions
+ * @see setOptions()
+ */
+ public function getOptions()
+ {
+ if (!$this->options) {
+ $this->setOptions(new RedisOptions());
+ }
+ return $this->options;
+ }
+
+ /**
+ * Internal method to get an item.
+ *
+ * @param string &$normalizedKey Key where to store data
+ * @param bool &$success If the operation was successfull
+ * @param mixed &$casToken Token
+ * @return mixed Data on success, false on key not found
+ * @throws Exception\RuntimeException
+ */
+ protected function internalGetItem(& $normalizedKey, & $success = null, & $casToken = null)
+ {
+ $redis = $this->getRedisResource();
+ try {
+ $value = $redis->get($this->namespacePrefix . $normalizedKey);
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+
+ if ($value === false) {
+ $success = false;
+ return null;
+ }
+
+ $success = true;
+ $casToken = $value;
+ return $value;
+ }
+
+ /**
+ * Internal method to get multiple items.
+ *
+ * @param array &$normalizedKeys Array of keys to be obtained
+ *
+ * @return array Associative array of keys and values
+ * @throws Exception\RuntimeException
+ */
+ protected function internalGetItems(array & $normalizedKeys)
+ {
+ $redis = $this->getRedisResource();
+
+ $namespacedKeys = array();
+ foreach ($normalizedKeys as & $normalizedKey) {
+ $namespacedKeys[] = $this->namespacePrefix . $normalizedKey;
+ }
+
+ try {
+ $results = $redis->mGet($namespacedKeys);
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ //combine the key => value pairs and remove all missing values
+ return array_filter(
+ array_combine($normalizedKeys, $results),
+ function($value) {
+ return $value !== false;
+ }
+ );
+ }
+
+ /**
+ * Internal method to test if an item exists.
+ *
+ * @param string &$normalizedKey Normalized key which will be checked
+ *
+ * @return bool
+ * @throws Exception\RuntimeException
+ */
+ protected function internalHasItem(& $normalizedKey)
+ {
+ $redis = $this->getRedisResource();
+ try {
+ return $redis->exists($this->namespacePrefix . $normalizedKey);
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ }
+
+ /**
+ * Internal method to store an item.
+ *
+ * @param string &$normalizedKey Key in Redis under which value will be saved
+ * @param mixed &$value Value to store under cache key
+ *
+ * @return bool
+ * @throws Exception\RuntimeException
+ */
+ protected function internalSetItem(& $normalizedKey, & $value)
+ {
+ try {
+ $redis = $this->getRedisResource();
+ $ttl = $this->getOptions()->getTtl();
+ if ($ttl) {
+ if ($this->resourceManager->getMayorVersion($this->resourceId) < 2) {
+ throw new Exception\UnsupportedMethodCallException("To use ttl you need version >= 2.0.0");
+ }
+ $success = $redis->setex($this->namespacePrefix . $normalizedKey, $ttl, $value);
+ } else {
+ $success = $redis->set($this->namespacePrefix . $normalizedKey, $value);
+ }
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+
+ return $success;
+ }
+
+ /**
+ * Internal method to store multiple items.
+ *
+ * @param array &$normalizedKeyValuePairs An array of normalized key/value pairs
+ *
+ * @return array Array of not stored keys
+ * @throws Exception\RuntimeException
+ */
+ protected function internalSetItems(array & $normalizedKeyValuePairs)
+ {
+ $redis = $this->getRedisResource();
+ $ttl = $this->getOptions()->getTtl();
+
+ $namespacedKeyValuePairs = array();
+ foreach ($normalizedKeyValuePairs as $normalizedKey => & $value) {
+ $namespacedKeyValuePairs[$this->namespacePrefix . $normalizedKey] = & $value;
+ }
+ try {
+ if ($ttl > 0) {
+ //check if ttl is supported
+ if ($this->resourceManager->getMayorVersion($this->resourceId) < 2) {
+ throw new Exception\UnsupportedMethodCallException("To use ttl you need version >= 2.0.0");
+ }
+ //mSet does not allow ttl, so use transaction
+ $transaction = $redis->multi();
+ foreach ($namespacedKeyValuePairs as $key => $value) {
+ $transaction->setex($key, $ttl, $value);
+ }
+ $success = $transaction->exec();
+ } else {
+ $success = $redis->mSet($namespacedKeyValuePairs);
+ }
+
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ if (!$success) {
+ throw new Exception\RuntimeException($redis->getLastError());
+ }
+
+ return array();
+ }
+
+ /**
+ * Add an item.
+ *
+ * @param string $normalizedKey
+ * @param mixed $value
+ * @return bool
+ * @throws Exception\RuntimeException
+ */
+ protected function internalAddItem(& $normalizedKey, & $value)
+ {
+ $redis = $this->getRedisResource();
+ try {
+ return $redis->setnx($this->namespacePrefix . $normalizedKey, $value);
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ }
+
+ /**
+ * Internal method to remove an item.
+ *
+ * @param string &$normalizedKey Key which will be removed
+ *
+ * @return bool
+ * @throws Exception\RuntimeException
+ */
+ protected function internalRemoveItem(& $normalizedKey)
+ {
+ $redis = $this->getRedisResource();
+ try {
+ return (bool) $redis->delete($this->namespacePrefix . $normalizedKey);
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ }
+
+ /**
+ * Internal method to increment an item.
+ *
+ * @param string $normalizedKey
+ * @param int $value
+ * @return int|bool The new value on success, false on failure
+ * @throws Exception\RuntimeException
+ */
+ protected function internalIncrementItem(& $normalizedKey, & $value)
+ {
+ $redis = $this->getRedisResource();
+ try {
+ return $redis->incrBy($this->namespacePrefix . $normalizedKey, $value);
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ }
+
+ /**
+ * Internal method to decrement an item.
+ *
+ * @param string $normalizedKey
+ * @param int $value
+ * @return int|bool The new value on success, false on failure
+ * @throws Exception\RuntimeException
+ */
+ protected function internalDecrementItem(& $normalizedKey, & $value)
+ {
+ $redis = $this->getRedisResource();
+ try {
+ return $redis->decrBy($this->namespacePrefix . $normalizedKey, $value);
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ }
+
+ /**
+ * Flush currently set DB
+ *
+ * @return bool
+ * @throws Exception\RuntimeException
+ */
+ public function flush()
+ {
+ $redis = $this->getRedisResource();
+ try {
+ return $redis->flushDB();
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+ }
+
+ /* TotalSpaceCapableInterface */
+
+ /**
+ * Get total space in bytes
+ *
+ * @return int|float
+ */
+ public function getTotalSpace()
+ {
+ $redis = $this->getRedisResource();
+ try {
+ $info = $redis->info();
+ } catch (RedisResourceException $e) {
+ throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
+ }
+
+ return $info['used_memory'];
+
+ }
+
+ /* status */
+
+ /**
+ * Internal method to get capabilities of this adapter
+ *
+ * @return Capabilities
+ */
+ protected function internalGetCapabilities()
+ {
+ if ($this->capabilities === null) {
+ $this->capabilityMarker = new stdClass();
+ $minTtl = $this->resourceManager->getMayorVersion($this->resourceId) < 2 ? 0 : 1;
+ //without serialization redis supports only strings for simple
+ //get/set methods
+ $this->capabilities = new Capabilities(
+ $this,
+ $this->capabilityMarker,
+ array(
+ 'supportedDatatypes' => array(
+ 'NULL' => 'string',
+ 'boolean' => 'string',
+ 'integer' => 'string',
+ 'double' => 'string',
+ 'string' => true,
+ 'array' => false,
+ 'object' => false,
+ 'resource' => false,
+ ),
+ 'supportedMetadata' => array(),
+ 'minTtl' => $minTtl,
+ 'maxTtl' => 0,
+ 'staticTtl' => true,
+ 'ttlPrecision' => 1,
+ 'useRequestTime' => false,
+ 'expiredRead' => false,
+ 'maxKeyLength' => 255,
+ 'namespaceIsPrefix' => true,
+ )
+ );
+ }
+
+ return $this->capabilities;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b90cd95a053f0a377051cbc18e769a5e3bbc8e5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Cache\Storage\Adapter;
+
+use Redis as RedisResource;
+use Zend\Cache\Storage\Adapter\AdapterOptions;
+
+class RedisOptions extends AdapterOptions
+{
+ /**
+ * The namespace separator
+ * @var string
+ */
+ protected $namespaceSeparator = ':';
+
+ /**
+ * The memcached resource manager
+ *
+ * @var null|RedisResourceManager
+ */
+ protected $resourceManager;
+
+ /**
+ * The resource id of the resource manager
+ *
+ * @var string
+ */
+ protected $resourceId = 'default';
+
+ /**
+ * Set namespace.
+ *
+ * The option Redis::OPT_PREFIX will be used as the namespace.
+ * It can't be longer than 128 characters.
+ *
+ * @param string $namespace Prefix for each key stored in redis
+ * @return \Zend\Cache\Storage\Adapter\RedisOptions
+ *
+ * @see AdapterOptions::setNamespace()
+ * @see RedisOptions::setPrefixKey()
+ */
+ public function setNamespace($namespace)
+ {
+ $namespace = (string) $namespace;
+
+ if (128 < strlen($namespace)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects a prefix key of no longer than 128 characters',
+ __METHOD__
+ ));
+ }
+
+ return parent::setNamespace($namespace);
+ }
+
+ /**
+ * Set namespace separator
+ *
+ * @param string $namespaceSeparator
+ * @return RedisOptions
+ */
+ public function setNamespaceSeparator($namespaceSeparator)
+ {
+ $namespaceSeparator = (string) $namespaceSeparator;
+ if ($this->namespaceSeparator !== $namespaceSeparator) {
+ $this->triggerOptionEvent('namespace_separator', $namespaceSeparator);
+ $this->namespaceSeparator = $namespaceSeparator;
+ }
+ return $this;
+ }
+
+ /**
+ * Get namespace separator
+ *
+ * @return string
+ */
+ public function getNamespaceSeparator()
+ {
+ return $this->namespaceSeparator;
+ }
+
+ /**
+ * Set the redis resource manager to use
+ *
+ * @param null|RedisResourceManager $resourceManager
+ * @return RedisOptions
+ */
+ public function setResourceManager(RedisResourceManager $resourceManager = null)
+ {
+ if ($this->resourceManager !== $resourceManager) {
+ $this->triggerOptionEvent('resource_manager', $resourceManager);
+ $this->resourceManager = $resourceManager;
+ }
+ return $this;
+ }
+
+ /**
+ * Get the redis resource manager
+ *
+ * @return RedisResourceManager
+ */
+ public function getResourceManager()
+ {
+ if (!$this->resourceManager) {
+ $this->resourceManager = new RedisResourceManager();
+ }
+ return $this->resourceManager;
+ }
+
+ /**
+ * Get the redis resource id
+ *
+ * @return string
+ */
+ public function getResourceId()
+ {
+ return $this->resourceId;
+ }
+
+ /**
+ * Set the redis resource id
+ *
+ * @param string $resourceId
+ * @return RedisOptions
+ */
+ public function setResourceId($resourceId)
+ {
+ $resourceId = (string) $resourceId;
+ if ($this->resourceId !== $resourceId) {
+ $this->triggerOptionEvent('resource_id', $resourceId);
+ $this->resourceId = $resourceId;
+ }
+ return $this;
+ }
+
+ /**
+ * Get the persistent id
+ *
+ * @return string
+ */
+ public function getPersistentId()
+ {
+ return $this->getResourceManager()->getPersistentId($this->getResourceId());
+ }
+
+ /**
+ * Set the persistent id
+ *
+ * @param string $persistentId
+ * @return RedisOptions
+ */
+ public function setPersistentId($persistentId)
+ {
+ $this->triggerOptionEvent('persistent_id', $persistentId);
+ $this->getResourceManager()->setPersistentId($this->getResourceId(), $persistentId);
+ return $this;
+ }
+
+ /**
+ * Set redis options
+ *
+ * @param array $libOptions
+ * @return RedisOptions
+ * @link http://github.com/nicolasff/phpredis#setoption
+ */
+ public function setLibOptions(array $libOptions)
+ {
+ $this->getResourceManager()->setLibOptions($this->getResourceId(), $libOptions);
+ return $this;
+ }
+
+ /**
+ * Get redis options
+ *
+ * @return array
+ * @link http://github.com/nicolasff/phpredis#setoption
+ */
+ public function getLibOptions()
+ {
+ return $this->getResourceManager()->getLibOptions($this->getResourceId());
+ }
+
+ /**
+ * Set server
+ *
+ * Server can be described as follows:
+ * - URI: /path/to/sock.sock
+ * - Assoc: array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
+ * - List: array(<host>[, <port>, [, <timeout>]])
+ *
+ * @param string|array $server
+ *
+ * @return RedisOptions
+ */
+ public function setServer($server)
+ {
+ $this->getResourceManager()->setServer($this->getResourceId(), $server);
+ return $this;
+ }
+
+ /**
+ * Get server
+ *
+ * @return array array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
+ */
+ public function getServer()
+ {
+ return $this->getResourceManager()->getServer($this->getResourceId());
+ }
+
+ /**
+ * Set resource database number
+ *
+ * @param int $database Database number
+ *
+ * @return RedisOptions
+ */
+ public function setDatabase($database)
+ {
+ $this->getResourceManager()->setDatabase($this->getResourceId(), $database);
+ return $this;
+ }
+
+ /**
+ * Get resource database number
+ *
+ * @return int Database number
+ */
+ public function getDatabase()
+ {
+ return $this->getResourceManager()->getDatabase($this->getResourceId());
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
new file mode 100644
index 0000000000000000000000000000000000000000..d91deba547aecb9ac7a2a243f96351820ae4bdfd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
@@ -0,0 +1,583 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Cache\Storage\Adapter;
+
+use Redis as RedisResource;
+use RedisException as RedisResourceException;
+use ReflectionClass;
+use Traversable;
+use Zend\Cache\Exception;
+use Zend\Stdlib\ArrayUtils;
+
+/**
+ * This is a resource manager for redis
+ */
+class RedisResourceManager
+{
+
+ /**
+ * Registered resources
+ *
+ * @var array
+ */
+ protected $resources = array();
+
+ /**
+ * Check if a resource exists
+ *
+ * @param string $id
+ * @return bool
+ */
+ public function hasResource($id)
+ {
+ return isset($this->resources[$id]);
+ }
+
+ /**
+ * Gets a redis resource
+ *
+ * @param string $id
+ * @return RedisResource
+ * @throws Exception\RuntimeException
+ */
+ public function getResource($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ if ($resource['resource'] instanceof RedisResource) {
+ //in case new server was set then connect
+ if (!$resource['initialized']) {
+ $this->connect($resource);
+ }
+ $info = $resource['resource']->info();
+ $resource['version'] = $info['redis_version'];
+ return $resource['resource'];
+ }
+
+ $redis = new RedisResource();
+
+ foreach ($resource['lib_options'] as $k => $v) {
+ $redis->setOption($k, $v);
+ }
+
+ $resource['resource'] = $redis;
+ $this->connect($resource);
+
+ $info = $redis->info();
+ $resource['version'] = $info['redis_version'];
+ $this->resources[$id]['resource'] = $redis;
+ return $redis;
+ }
+
+ /**
+ * Connects to redis server
+ *
+ *
+ * @param array & $resource
+ *
+ * @return null
+ * @throws Exception\RuntimeException
+ */
+ protected function connect(array & $resource)
+ {
+ $server = $resource['server'];
+ $redis = $resource['resource'];
+ if ($resource['persistent_id'] !== '') {
+ //connect or reuse persistent connection
+ $success = $redis->pconnect($server['host'], $server['port'], $server['timeout'], $server['persistend_id']);
+ } elseif ($server['port']) {
+ $success = $redis->connect($server['host'], $server['port'], $server['timeout']);
+ } elseif ($server['timeout']) {
+ //connect through unix domain socket
+ $success = $redis->connect($server['host'], $server['timeout']);
+ } else {
+ $success = $redis->connect($server['host']);
+ }
+
+ if (!$success) {
+ throw new Exception\RuntimeException('Could not estabilish connection with Redis instance');
+ }
+ $resource['initialized'] = true;
+ if ($resource['password']) {
+ $redis->auth($resource['password']);
+ }
+ $redis->select($resource['database']);
+ }
+
+ /**
+ * Set a resource
+ *
+ * @param string $id
+ * @param array|Traversable|RedisResource $resource
+ * @return RedisResourceManager Fluent interface
+ */
+ public function setResource($id, $resource)
+ {
+ $id = (string) $id;
+ //TODO: how to get back redis connection info from resource?
+ $defaults = array(
+ 'persistent_id' => '',
+ 'lib_options' => array(),
+ 'server' => array(),
+ 'password' => '',
+ 'database' => 0,
+ 'resource' => null,
+ 'initialized' => false,
+ 'version' => 0,
+ );
+ if (!$resource instanceof RedisResource) {
+ if ($resource instanceof Traversable) {
+ $resource = ArrayUtils::iteratorToArray($resource);
+ } elseif (!is_array($resource)) {
+ throw new Exception\InvalidArgumentException(
+ 'Resource must be an instance of an array or Traversable'
+ );
+ }
+
+ $resource = array_merge($defaults, $resource);
+ // normalize and validate params
+ $this->normalizePersistentId($resource['persistent_id']);
+ $this->normalizeLibOptions($resource['lib_options']);
+ $this->normalizeServer($resource['server']);
+ } else {
+ //there are two ways of determining if redis is already initialized
+ //with connect function:
+ //1) pinging server
+ //2) checking undocummented property socket which is available only
+ //after successfull connect
+ $resource = array_merge($defaults, array(
+ 'resource' => $resource,
+ 'initialized' => isset($resource->socket),
+ )
+ );
+ }
+ $this->resources[$id] = $resource;
+ return $this;
+ }
+
+ /**
+ * Remove a resource
+ *
+ * @param string $id
+ * @return RedisResourceManager Fluent interface
+ */
+ public function removeResource($id)
+ {
+ unset($this->resources[$id]);
+ return $this;
+ }
+
+ /**
+ * Set the persistent id
+ *
+ * @param string $id
+ * @param string $persistentId
+ * @return RedisResourceManager Fluent interface
+ * @throws Exception\RuntimeException
+ */
+ public function setPersistentId($id, $persistentId)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'persistent_id' => $persistentId
+ ));
+ }
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof RedisResource) {
+ throw new Exception\RuntimeException(
+ "Can't change persistent id of resource {$id} after instanziation"
+ );
+ }
+
+ $this->normalizePersistentId($persistentId);
+ $resource['persistent_id'] = $persistentId;
+
+ return $this;
+ }
+
+ /**
+ * Get the persistent id
+ *
+ * @param string $id
+ * @return string
+ * @throws Exception\RuntimeException
+ */
+ public function getPersistentId($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+
+ if ($resource instanceof RedisResource) {
+ throw new Exception\RuntimeException(
+ "Can't get persistent id of an instantiated redis resource"
+ );
+ }
+
+ return $resource['persistent_id'];
+ }
+
+ /**
+ * Normalize the persistent id
+ *
+ * @param string $persistentId
+ */
+ protected function normalizePersistentId(& $persistentId)
+ {
+ $persistentId = (string) $persistentId;
+ }
+
+ /**
+ * Set Redis options
+ *
+ * @param string $id
+ * @param array $libOptions
+ * @return RedisResourceManager Fluent interface
+ */
+ public function setLibOptions($id, array $libOptions)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'lib_options' => $libOptions
+ ));
+ }
+
+ $this->normalizeLibOptions($libOptions);
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof RedisResource) {
+ if (method_exists($resource, 'setOptions')) {
+ $resource->setOptions($libOptions);
+ } else {
+ foreach ($libOptions as $key => $value) {
+ $resource->setOption($key, $value);
+ }
+ }
+ } else {
+ $resource['lib_options'] = $libOptions;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Get Redis options
+ *
+ * @param string $id
+ * @return array
+ * @throws Exception\RuntimeException
+ */
+ public function getLibOptions($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+
+ if ($resource instanceof RedisResource) {
+ $libOptions = array();
+ $reflection = new ReflectionClass('Redis');
+ $constants = $reflection->getConstants();
+ foreach ($constants as $constName => $constValue) {
+ if (substr($constName, 0, 4) == 'OPT_') {
+ $libOptions[$constValue] = $resource->getOption($constValue);
+ }
+ }
+ return $libOptions;
+ }
+ return $resource['lib_options'];
+ }
+
+ /**
+ * Set one Redis option
+ *
+ * @param string $id
+ * @param string|int $key
+ * @param mixed $value
+ * @return RedisResourceManager Fluent interface
+ */
+ public function setLibOption($id, $key, $value)
+ {
+ return $this->setLibOptions($id, array($key => $value));
+ }
+
+ /**
+ * Get one Redis option
+ *
+ * @param string $id
+ * @param string|int $key
+ * @return mixed
+ * @throws Exception\RuntimeException
+ */
+ public function getLibOption($id, $key)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $this->normalizeLibOptionKey($key);
+ $resource = & $this->resources[$id];
+
+ if ($resource instanceof RedisResource) {
+ return $resource->getOption($key);
+ }
+
+ return isset($resource['lib_options'][$key]) ? $resource['lib_options'][$key] : null;
+ }
+
+ /**
+ * Normalize Redis options
+ *
+ * @param array|Traversable $libOptions
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function normalizeLibOptions(& $libOptions)
+ {
+ if (!is_array($libOptions) && !($libOptions instanceof Traversable)) {
+ throw new Exception\InvalidArgumentException(
+ "Lib-Options must be an array or an instance of Traversable"
+ );
+ }
+
+ $result = array();
+ foreach ($libOptions as $key => $value) {
+ $this->normalizeLibOptionKey($key);
+ $result[$key] = $value;
+ }
+
+ $libOptions = $result;
+ }
+
+ /**
+ * Convert option name into it's constant value
+ *
+ * @param string|int $key
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function normalizeLibOptionKey(& $key)
+ {
+ // convert option name into it's constant value
+ if (is_string($key)) {
+ $const = 'Redis::OPT_' . str_replace(array(' ', '-'), '_', strtoupper($key));
+ if (!defined($const)) {
+ throw new Exception\InvalidArgumentException("Unknown redis option '{$key}' ({$const})");
+ }
+ $key = constant($const);
+ } else {
+ $key = (int) $key;
+ }
+ }
+
+ /**
+ * Set server
+ *
+ * Server can be described as follows:
+ * - URI: /path/to/sock.sock
+ * - Assoc: array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
+ * - List: array(<host>[, <port>, [, <timeout>]])
+ *
+ * @param string $id
+ * @param string|array $server
+ * @return RedisResourceManager
+ */
+ public function setServer($id, $server)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'server' => $server
+ ));
+ }
+
+ $this->normalizeServer($server);
+
+ $resource = & $this->resources[$id];
+ if ($resource['resource'] instanceof RedisResource) {
+ $this->setResource($id, array('server' => $server));
+ } else {
+ $resource['server'] = $server;
+ }
+ return $this;
+ }
+
+ /**
+ * Get server
+ * @param string $id
+ * @throws Exception\RuntimeException
+ * @return array array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
+ */
+ public function getServer($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return $resource['server'];
+ }
+
+ /**
+ * Set redis password
+ *
+ * @param string $id
+ * @param string $password
+ * @return RedisResource
+ */
+ public function setPassword($id, $password)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'password' => $password,
+ ));
+ }
+
+ $resource = & $this->resources[$id];
+ $resource['password'] = $password;
+ $resource['initialized'] = false;
+ return $this;
+ }
+
+ /**
+ * Get redis resource password
+ *
+ * @param string $id
+ * @return string
+ */
+ public function getPassword($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return $resource['password'];
+ }
+
+ /**
+ * Set redis database number
+ *
+ * @param string $id
+ * @param int $database
+ * @return RedisResource
+ */
+ public function setDatabase($id, $database)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'database' => (int)$database,
+ ));
+ }
+
+ $resource = & $this->resources[$id];
+ $resource['database'] = $database;
+ $resource['initialized'] = false;
+ return $this;
+ }
+
+ /**
+ * Get redis resource database
+ *
+ * @param string $id
+ * @return string
+ */
+ public function getDatabase($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return $resource['database'];
+ }
+
+ /**
+ * Get redis server version
+ *
+ * @param string $id
+ * @return int
+ * @throws Exception\RuntimeException
+ */
+ public function getMayorVersion($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return (int)$resource['version'];
+ }
+
+ /**
+ * Normalize one server into the following format:
+ * array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
+ *
+ * @param string|array $server
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function normalizeServer(& $server)
+ {
+ $host = null;
+ $port = null;
+ $timeout = 0;
+ // convert a single server into an array
+ if ($server instanceof Traversable) {
+ $server = ArrayUtils::iteratorToArray($server);
+ }
+
+ if (is_array($server)) {
+ // array(<host>[, <port>[, <timeout>]])
+ if (isset($server[0])) {
+ $host = (string) $server[0];
+ $port = isset($server[1]) ? (int) $server[1] : $port;
+ $timeout = isset($server[2]) ? (int) $server[2] : $timeout;
+ }
+
+ // array('host' => <host>[, 'port' => <port>, ['timeout' => <timeout>]])
+ if (!isset($server[0]) && isset($server['host'])) {
+ $host = (string) $server['host'];
+ $port = isset($server['port']) ? (int) $server['port'] : $port;
+ $timeout = isset($server['timeout']) ? (int) $server['timeout'] : $timeout;
+ }
+
+ } else {
+ // parse server from URI host{:?port}
+ $server = trim($server);
+ if (!strpos($server, '/') === 0) {
+ //non unix domain socket connection
+ $server = parse_url($server);
+ } else {
+ $server = array('host' => $server);
+ }
+ if (!$server) {
+ throw new Exception\InvalidArgumentException("Invalid server given");
+ }
+
+ $host = $server['host'];
+ $port = isset($server['port']) ? (int) $server['port'] : $port;
+ $timeout = isset($server['timeout']) ? (int) $server['timeout'] : $timeout;
+ }
+
+ if (!$host) {
+ throw new Exception\InvalidArgumentException('Missing required server host');
+ }
+
+ $server = array(
+ 'host' => $host,
+ 'port' => $port,
+ 'timeout' => $timeout,
+ );
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php
index aa08d2ade5b485ba0e2c2736d0518fdb24e9403c..072ec21129fbddae7967e0686858a5b887ac9f34 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php
@@ -93,7 +93,7 @@ class Session extends AbstractAdapter implements
/**
* Flush the whole session container
*
- * @return boolean
+ * @return bool
*/
public function flush()
{
@@ -107,7 +107,7 @@ class Session extends AbstractAdapter implements
* Remove items matching given prefix
*
* @param string $prefix
- * @return boolean
+ * @return bool
*/
public function clearByPrefix($prefix)
{
@@ -141,7 +141,7 @@ class Session extends AbstractAdapter implements
* Internal method to get an item.
*
* @param string $normalizedKey
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -197,7 +197,7 @@ class Session extends AbstractAdapter implements
* Internal method to test if an item exists.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
*/
protected function internalHasItem(& $normalizedKey)
{
@@ -242,7 +242,7 @@ class Session extends AbstractAdapter implements
* Get metadata of an item.
*
* @param string $normalizedKey
- * @return array|boolean Metadata on success, false on failure
+ * @return array|bool Metadata on success, false on failure
* @throws Exception\ExceptionInterface
*
* @triggers getMetadata.pre(PreEvent)
@@ -261,7 +261,7 @@ class Session extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalSetItem(& $normalizedKey, & $value)
@@ -301,7 +301,7 @@ class Session extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalAddItem(& $normalizedKey, & $value)
@@ -361,7 +361,7 @@ class Session extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalReplaceItem(& $normalizedKey, & $value)
@@ -416,7 +416,7 @@ class Session extends AbstractAdapter implements
* Internal method to remove an item.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalRemoveItem(& $normalizedKey)
@@ -449,7 +449,7 @@ class Session extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalIncrementItem(& $normalizedKey, & $value)
@@ -481,7 +481,7 @@ class Session extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalDecrementItem(& $normalizedKey, & $value)
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
index 72e68ae9b83b29643e313a47be7c6643520d386a..6bbaf4065b551261e2f4b8ae6472bd8bdcf91dd2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
@@ -27,7 +27,7 @@ class SessionOptions extends AdapterOptions
/**
* Set the session container
*
- * @param null|SessionContainer $memoryLimit
+ * @param null|SessionContainer $sessionContainer
* @return SessionOptions
*/
public function setSessionContainer(SessionContainer $sessionContainer = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
index 0f6d7fcd13c5ec9ce191052d118503539a6a1c75..24cbfd9eef5442b118c85917028be025bba0d584 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
@@ -172,7 +172,7 @@ class WinCache extends AbstractAdapter implements
$prefixL = strlen($prefix);
$result = array();
foreach ($fetch as $internalKey => & $value) {
- $result[ substr($internalKey, $prefixL) ] = & $value;
+ $result[substr($internalKey, $prefixL)] = & $value;
}
return $result;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php
index 54c3f40d2a67bc7d1691e5b423ba1f660dcddb57..ea34b60629543ee3b0a8207113b55a0960b4cf17 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php
@@ -155,7 +155,7 @@ class XCache extends AbstractAdapter implements
* Remove items by given namespace
*
* @param string $namespace
- * @return boolean
+ * @return bool
*/
public function clearByNamespace($namespace)
{
@@ -177,7 +177,7 @@ class XCache extends AbstractAdapter implements
* Remove items matching given prefix
*
* @param string $prefix
- * @return boolean
+ * @return bool
*/
public function clearByPrefix($prefix)
{
@@ -199,7 +199,7 @@ class XCache extends AbstractAdapter implements
/**
* Flush the whole storage
*
- * @return boolean
+ * @return bool
*/
public function flush()
{
@@ -262,7 +262,7 @@ class XCache extends AbstractAdapter implements
* Internal method to get an item.
*
* @param string $normalizedKey
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -288,7 +288,7 @@ class XCache extends AbstractAdapter implements
* Internal method to test if an item exists.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalHasItem(& $normalizedKey)
@@ -303,7 +303,7 @@ class XCache extends AbstractAdapter implements
* Get metadata of an item.
*
* @param string $normalizedKey
- * @return array|boolean Metadata on success, false on failure
+ * @return array|bool Metadata on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalGetMetadata(& $normalizedKey)
@@ -339,7 +339,7 @@ class XCache extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalSetItem(& $normalizedKey, & $value)
@@ -364,7 +364,7 @@ class XCache extends AbstractAdapter implements
* Internal method to remove an item.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalRemoveItem(& $normalizedKey)
@@ -382,7 +382,7 @@ class XCache extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalIncrementItem(& $normalizedKey, & $value)
@@ -402,7 +402,7 @@ class XCache extends AbstractAdapter implements
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalDecrementItem(& $normalizedKey, & $value)
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
index e8f712a72902919564af3e5f98cfeb1fb5e57d95..49622f2eaeed2860ad2d961e02ac40decdaf40d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
@@ -24,7 +24,7 @@ class XCacheOptions extends AdapterOptions
/**
* Handle admin authentication
*
- * @var boolean
+ * @var bool
*/
protected $adminAuth = false;
@@ -95,12 +95,12 @@ class XCacheOptions extends AdapterOptions
/**
* Enable/Disable admin authentication handling
*
- * @param boolean $adminAuth
+ * @param bool $adminAuth
* @return XCacheOptions
*/
public function setAdminAuth($adminAuth)
{
- $adminAuth = (boolean)$adminAuth;
+ $adminAuth = (bool) $adminAuth;
if ($this->adminAuth !== $adminAuth) {
$this->triggerOptionEvent('admin_auth', $adminAuth);
$this->adminAuth = $adminAuth;
@@ -111,7 +111,7 @@ class XCacheOptions extends AdapterOptions
/**
* Get admin authentication enabled
*
- * @return boolean
+ * @return bool
*/
public function getAdminAuth()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
index f269d2d7c96cf725d981ccba68840df7c34eb7b4..6aabd49a731fb6f4f8b1f5e8129432ef8782d51b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
@@ -9,7 +9,9 @@
namespace Zend\Cache\Storage\Plugin;
-abstract class AbstractPlugin implements PluginInterface
+use Zend\EventManager\AbstractListenerAggregate;
+
+abstract class AbstractPlugin extends AbstractListenerAggregate implements PluginInterface
{
/**
* @var PluginOptions
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
index b35d742742f2fbe7e937a2dc124dceb79069f3a1..64155701ec742dc5aa2505892ac2d1a9007c8559 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
@@ -17,62 +17,16 @@ use Zend\EventManager\EventManagerInterface;
class ClearExpiredByFactor extends AbstractPlugin
{
/**
- * Handles
- *
- * @var array
- */
- protected $handles = array();
-
- /**
- * Attach
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return ClearExpiredByFactor
- * @throws Exception\LogicException
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
- $index = spl_object_hash($events);
- if (isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin already attached');
- }
-
- $handles = array();
- $this->handles[$index] = & $handles;
-
$callback = array($this, 'clearExpiredByFactor');
- $handles[] = $events->attach('setItem.post', $callback, $priority);
- $handles[] = $events->attach('setItems.post', $callback, $priority);
- $handles[] = $events->attach('addItem.post', $callback, $priority);
- $handles[] = $events->attach('addItems.post', $callback, $priority);
-
- return $this;
- }
-
- /**
- * Detach
- *
- * @param EventManagerInterface $events
- * @return ClearExpiredByFactor
- * @throws Exception\LogicException
- */
- public function detach(EventManagerInterface $events)
- {
- $index = spl_object_hash($events);
- if (!isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin not attached');
- }
-
- // detach all handles of this index
- foreach ($this->handles[$index] as $handle) {
- $events->detach($handle);
- }
-
- // remove all detached handles
- unset($this->handles[$index]);
- return $this;
+ $this->listeners[] = $events->attach('setItem.post', $callback, $priority);
+ $this->listeners[] = $events->attach('setItems.post', $callback, $priority);
+ $this->listeners[] = $events->attach('addItem.post', $callback, $priority);
+ $this->listeners[] = $events->attach('addItems.post', $callback, $priority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
index 3af2432facd771f52dcb4cfbf3c71348487cee4c..b634983471b6599b67840e478f656d7d3e189ff1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
@@ -16,92 +16,46 @@ use Zend\EventManager\EventManagerInterface;
class ExceptionHandler extends AbstractPlugin
{
/**
- * Handles
- *
- * @var array
- */
- protected $handles = array();
-
- /**
- * Attach
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return ExceptionHandler
- * @throws Exception\LogicException
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
- $index = spl_object_hash($events);
- if (isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin already attached');
- }
-
$callback = array($this, 'onException');
- $handles = array();
- $this->handles[$index] = & $handles;
// read
- $handles[] = $events->attach('getItem.exception', $callback, $priority);
- $handles[] = $events->attach('getItems.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('getItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('getItems.exception', $callback, $priority);
- $handles[] = $events->attach('hasItem.exception', $callback, $priority);
- $handles[] = $events->attach('hasItems.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('hasItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('hasItems.exception', $callback, $priority);
- $handles[] = $events->attach('getMetadata.exception', $callback, $priority);
- $handles[] = $events->attach('getMetadatas.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('getMetadata.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('getMetadatas.exception', $callback, $priority);
// write
- $handles[] = $events->attach('setItem.exception', $callback, $priority);
- $handles[] = $events->attach('setItems.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('setItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('setItems.exception', $callback, $priority);
- $handles[] = $events->attach('addItem.exception', $callback, $priority);
- $handles[] = $events->attach('addItems.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('addItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('addItems.exception', $callback, $priority);
- $handles[] = $events->attach('replaceItem.exception', $callback, $priority);
- $handles[] = $events->attach('replaceItems.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('replaceItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('replaceItems.exception', $callback, $priority);
- $handles[] = $events->attach('touchItem.exception', $callback, $priority);
- $handles[] = $events->attach('touchItems.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('touchItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('touchItems.exception', $callback, $priority);
- $handles[] = $events->attach('removeItem.exception', $callback, $priority);
- $handles[] = $events->attach('removeItems.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('removeItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('removeItems.exception', $callback, $priority);
- $handles[] = $events->attach('checkAndSetItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('checkAndSetItem.exception', $callback, $priority);
// increment / decrement item(s)
- $handles[] = $events->attach('incrementItem.exception', $callback, $priority);
- $handles[] = $events->attach('incrementItems.exception', $callback, $priority);
-
- $handles[] = $events->attach('decrementItem.exception', $callback, $priority);
- $handles[] = $events->attach('decrementItems.exception', $callback, $priority);
-
- return $this;
- }
-
- /**
- * Detach
- *
- * @param EventManagerInterface $events
- * @return ExceptionHandler
- * @throws Exception\LogicException
- */
- public function detach(EventManagerInterface $events)
- {
- $index = spl_object_hash($events);
- if (!isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin not attached');
- }
-
- // detach all handles of this index
- foreach ($this->handles[$index] as $handle) {
- $events->detach($handle);
- }
-
- // remove all detached handles
- unset($this->handles[$index]);
+ $this->listeners[] = $events->attach('incrementItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('incrementItems.exception', $callback, $priority);
- return $this;
+ $this->listeners[] = $events->attach('decrementItem.exception', $callback, $priority);
+ $this->listeners[] = $events->attach('decrementItems.exception', $callback, $priority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
index 5e6ba9f8d271ca6a4f7aa8e69c34afcf5e89caf0..67888093c966235414db502d46eb31cf39fb3d9d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
@@ -15,13 +15,6 @@ use Zend\EventManager\EventManagerInterface;
class IgnoreUserAbort extends AbstractPlugin
{
- /**
- * Handles
- *
- * @var array
- */
- protected $handles = array();
-
/**
* The storage who activated ignore_user_abort.
*
@@ -30,97 +23,57 @@ class IgnoreUserAbort extends AbstractPlugin
protected $activatedTarget = null;
/**
- * Attach
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return Serializer
- * @throws Exception\LogicException
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
- $index = spl_object_hash($events);
- if (isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin already attached');
- }
-
- $handles = array();
- $this->handles[$index] = & $handles;
-
$cbOnBefore = array($this, 'onBefore');
$cbOnAfter = array($this, 'onAfter');
- $handles[] = $events->attach('setItem.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('setItem.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('setItem.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('setItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('setItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('setItem.exception', $cbOnAfter, $priority);
- $handles[] = $events->attach('setItems.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('setItems.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('setItems.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('setItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('setItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('setItems.exception', $cbOnAfter, $priority);
- $handles[] = $events->attach('addItem.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('addItem.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('addItem.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('addItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('addItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('addItem.exception', $cbOnAfter, $priority);
- $handles[] = $events->attach('addItems.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('addItems.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('addItems.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('addItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('addItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('addItems.exception', $cbOnAfter, $priority);
- $handles[] = $events->attach('replaceItem.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('replaceItem.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('replaceItem.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('replaceItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('replaceItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('replaceItem.exception', $cbOnAfter, $priority);
- $handles[] = $events->attach('replaceItems.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('replaceItems.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('replaceItems.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('replaceItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('replaceItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('replaceItems.exception', $cbOnAfter, $priority);
- $handles[] = $events->attach('checkAndSetItem.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('checkAndSetItem.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('checkAndSetItem.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('checkAndSetItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('checkAndSetItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('checkAndSetItem.exception', $cbOnAfter, $priority);
// increment / decrement item(s)
- $handles[] = $events->attach('incrementItem.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('incrementItem.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('incrementItem.exception', $cbOnAfter, $priority);
-
- $handles[] = $events->attach('incrementItems.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('incrementItems.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('incrementItems.exception', $cbOnAfter, $priority);
-
- $handles[] = $events->attach('decrementItem.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('decrementItem.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('decrementItem.exception', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('incrementItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('incrementItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('incrementItem.exception', $cbOnAfter, $priority);
- $handles[] = $events->attach('decrementItems.pre', $cbOnBefore, $priority);
- $handles[] = $events->attach('decrementItems.post', $cbOnAfter, $priority);
- $handles[] = $events->attach('decrementItems.exception', $cbOnAfter, $priority);
-
- return $this;
- }
-
- /**
- * Detach
- *
- * @param EventManagerInterface $events
- * @return Serializer
- * @throws Exception\LogicException
- */
- public function detach(EventManagerInterface $events)
- {
- $index = spl_object_hash($events);
- if (!isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin not attached');
- }
-
- // detach all handles of this index
- foreach ($this->handles[$index] as $handle) {
- $events->detach($handle);
- }
+ $this->listeners[] = $events->attach('incrementItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('incrementItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('incrementItems.exception', $cbOnAfter, $priority);
- // remove all detached handles
- unset($this->handles[$index]);
+ $this->listeners[] = $events->attach('decrementItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('decrementItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('decrementItem.exception', $cbOnAfter, $priority);
- return $this;
+ $this->listeners[] = $events->attach('decrementItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('decrementItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('decrementItems.exception', $cbOnAfter, $priority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
index a24aa4e1a309240c0153ba4eeb82d2022b67902f..b0ba023e90b7600ea901c1873ee94d9e74d57ae1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
@@ -17,60 +17,13 @@ use Zend\EventManager\EventManagerInterface;
class OptimizeByFactor extends AbstractPlugin
{
/**
- * Handles
- *
- * @var array
- */
- protected $handles = array();
-
- /**
- * Attach
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return OptimizeByFactor
- * @throws Exception\LogicException
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
- $index = spl_object_hash($events);
- if (isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin already attached');
- }
-
- $handles = array();
- $this->handles[$index] = & $handles;
-
- $callback = array($this, 'optimizeByFactor');
- $handles[] = $events->attach('removeItem.post', $callback, $priority);
- $handles[] = $events->attach('removeItems.post', $callback, $priority);
-
- return $this;
- }
-
- /**
- * Detach
- *
- * @param EventManagerInterface $events
- * @return OptimizeByFactor
- * @throws Exception\LogicException
- */
- public function detach(EventManagerInterface $events)
- {
- $index = spl_object_hash($events);
- if (!isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin not attached');
- }
-
- // detach all handles of this index
- foreach ($this->handles[$index] as $handle) {
- $events->detach($handle);
- }
-
- // remove all detached handles
- unset($this->handles[$index]);
-
- return $this;
+ $callback = array($this, 'optimizeByFactor');
+ $this->listeners[] = $events->attach('removeItem.post', $callback, $priority);
+ $this->listeners[] = $events->attach('removeItems.post', $callback, $priority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
index dec97804ee853160aac78166f4eef59df91de07e..df7db5b13be57c863b39322832d6525c21e9e83b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
@@ -24,87 +24,40 @@ class Serializer extends AbstractPlugin
protected $capabilities = array();
/**
- * Handles
- *
- * @var array
- */
- protected $handles = array();
-
- /**
- * Attach
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return Serializer
- * @throws Exception\LogicException
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
- $index = spl_object_hash($events);
- if (isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin already attached');
- }
-
- $handles = array();
- $this->handles[$index] = & $handles;
-
// The higher the priority the sooner the plugin will be called on pre events
// but the later it will be called on post events.
$prePriority = $priority;
$postPriority = -$priority;
// read
- $handles[] = $events->attach('getItem.post', array($this, 'onReadItemPost'), $postPriority);
- $handles[] = $events->attach('getItems.post', array($this, 'onReadItemsPost'), $postPriority);
+ $this->listeners[] = $events->attach('getItem.post', array($this, 'onReadItemPost'), $postPriority);
+ $this->listeners[] = $events->attach('getItems.post', array($this, 'onReadItemsPost'), $postPriority);
// write
- $handles[] = $events->attach('setItem.pre', array($this, 'onWriteItemPre'), $prePriority);
- $handles[] = $events->attach('setItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
+ $this->listeners[] = $events->attach('setItem.pre', array($this, 'onWriteItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('setItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
- $handles[] = $events->attach('addItem.pre', array($this, 'onWriteItemPre'), $prePriority);
- $handles[] = $events->attach('addItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
+ $this->listeners[] = $events->attach('addItem.pre', array($this, 'onWriteItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('addItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
- $handles[] = $events->attach('replaceItem.pre', array($this, 'onWriteItemPre'), $prePriority);
- $handles[] = $events->attach('replaceItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
+ $this->listeners[] = $events->attach('replaceItem.pre', array($this, 'onWriteItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('replaceItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
- $handles[] = $events->attach('checkAndSetItem.pre', array($this, 'onWriteItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('checkAndSetItem.pre', array($this, 'onWriteItemPre'), $prePriority);
// increment / decrement item(s)
- $handles[] = $events->attach('incrementItem.pre', array($this, 'onIncrementItemPre'), $prePriority);
- $handles[] = $events->attach('incrementItems.pre', array($this, 'onIncrementItemsPre'), $prePriority);
+ $this->listeners[] = $events->attach('incrementItem.pre', array($this, 'onIncrementItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('incrementItems.pre', array($this, 'onIncrementItemsPre'), $prePriority);
- $handles[] = $events->attach('decrementItem.pre', array($this, 'onDecrementItemPre'), $prePriority);
- $handles[] = $events->attach('decrementItems.pre', array($this, 'onDecrementItemsPre'), $prePriority);
+ $this->listeners[] = $events->attach('decrementItem.pre', array($this, 'onDecrementItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('decrementItems.pre', array($this, 'onDecrementItemsPre'), $prePriority);
// overwrite capabilities
- $handles[] = $events->attach('getCapabilities.post', array($this, 'onGetCapabilitiesPost'), $postPriority);
-
- return $this;
- }
-
- /**
- * Detach
- *
- * @param EventManagerInterface $events
- * @return Serializer
- * @throws Exception\LogicException
- */
- public function detach(EventManagerInterface $events)
- {
- $index = spl_object_hash($events);
- if (!isset($this->handles[$index])) {
- throw new Exception\LogicException('Plugin not attached');
- }
-
- // detach all handles of this index
- foreach ($this->handles[$index] as $handle) {
- $events->detach($handle);
- }
-
- // remove all detached handles
- unset($this->handles[$index]);
-
- return $this;
+ $this->listeners[] = $events->attach('getCapabilities.post', array($this, 'onGetCapabilitiesPost'), $postPriority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/composer.json b/vendor/zendframework/zendframework/library/Zend/Cache/composer.json
index 0dd7cc51d90cd3d59df3b0a0f414d582c40d642c..1d9089ac5eb5ee2689f136584ccf8ad08c8f4242 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/composer.json
@@ -31,8 +31,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php
index 415ee9c04bd495f5fad94b0cb827bf6c50c5e10e..6247ff90ebfb368a76e97d106edcb00f61dfcb6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php
@@ -79,10 +79,10 @@ abstract class AbstractAdapter extends AbstractValidator implements AdapterInter
return $this;
}
- $method = 'set' . ucfirst ($key);
- if (method_exists ($this, $method)) {
+ $method = 'set' . ucfirst($key);
+ if (method_exists($this, $method)) {
// Setter exists; use it
- $this->$method ($value);
+ $this->$method($value);
$this->options[$key] = $value;
} elseif (property_exists($this, $key)) {
// Assume it's metadata
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
index fa0ba1d3320ff097b4c75ad8906f4d2d7a86e9c4..f95f7537a97a422ad746c48e999ba8b4e65031ea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
@@ -9,8 +9,8 @@
namespace Zend\Captcha;
-use Zend\Session\Container;
use Zend\Math\Rand;
+use Zend\Session\Container;
/**
* AbstractWord-based captcha adapter
@@ -73,7 +73,7 @@ abstract class AbstractWord extends AbstractAdapter
/**
* Session lifetime for the captcha data
*
- * @var integer
+ * @var int
*/
protected $timeout = 300;
@@ -105,7 +105,7 @@ abstract class AbstractWord extends AbstractAdapter
/**
* Length of the word to generate
*
- * @var integer
+ * @var int
*/
protected $wordlen = 8;
@@ -134,7 +134,7 @@ abstract class AbstractWord extends AbstractAdapter
/**
* Retrieve word length to use when generating captcha
*
- * @return integer
+ * @return int
*/
public function getWordlen()
{
@@ -144,7 +144,7 @@ abstract class AbstractWord extends AbstractAdapter
/**
* Set word length of captcha
*
- * @param integer $wordlen
+ * @param int $wordlen
* @return AbstractWord
*/
public function setWordlen($wordlen)
@@ -248,7 +248,7 @@ abstract class AbstractWord extends AbstractAdapter
throw new Exception\InvalidArgumentException("Session class $this->sessionClass not found");
}
$this->session = new $this->sessionClass('Zend_Form_Captcha_' . $id);
- $this->session->setExpirationHops(1, null, true);
+ $this->session->setExpirationHops(1, null);
$this->session->setExpirationSeconds($this->getTimeout());
}
return $this->session;
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json b/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
index 6b504d0d82a336329dfecb01ac9713f55e4f3d6a..06eaa27863478254d85bf37492e57d02f6c3c739 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
@@ -25,8 +25,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php
index d59d4ffefd3a93bb0b7dc69c64425460d7395c4c..80eedaa915124d2f7018713b796226deae647b39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php
@@ -617,7 +617,7 @@ class ClassGenerator extends AbstractGenerator
*/
public function getMethod($methodName)
{
- foreach ($this->getMethods() as $method) {
+ foreach ($this->methods as $method) {
if ($method->getName() == $methodName) {
return $method;
}
@@ -626,6 +626,22 @@ class ClassGenerator extends AbstractGenerator
return false;
}
+ /**
+ * @param string $methodName
+ * @return ClassGenerator
+ */
+ public function removeMethod($methodName)
+ {
+ foreach ($this->methods as $key => $method) {
+ if ($method->getName() == $methodName) {
+ unset($this->methods[$key]);
+ break;
+ }
+ }
+
+ return $this;
+ }
+
/**
* @param string $methodName
* @return bool
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
index 6df058fb8517a37cb4af103c5f648e4701c29148..5478b329db3660a1f81a365d6b3c9579837a42c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
@@ -9,10 +9,10 @@
namespace Zend\Code\Generator\DocBlock;
-use Zend\Code\Generator\AbstractGenerator;
-use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag;
use ReflectionClass;
use ReflectionMethod;
+use Zend\Code\Generator\AbstractGenerator;
+use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag;
class Tag extends AbstractGenerator
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
index 08720a06a76ac5d12f77338cc208b1f879bc676b..bd1ac882428e517b2bfe2717aa3510801d5f976f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
@@ -35,7 +35,7 @@ class DocBlockGenerator extends AbstractGenerator
protected $indentation = '';
/**
- * @var boolean
+ * @var bool
*/
protected $wordwrap = true;
@@ -171,11 +171,11 @@ class DocBlockGenerator extends AbstractGenerator
if (is_array($tag)) {
$tag = new DockBlockTag($tag);
} elseif (!$tag instanceof DockBlockTag) {
- throw new Exception\InvalidArgumentException(
+ throw new Exception\InvalidArgumentException(sprintf(
'%s expects either an array of method options or an instance of %s\DocBlock\Tag',
__METHOD__,
__NAMESPACE__
- );
+ ));
}
$this->tags[] = $tag;
@@ -193,19 +193,19 @@ class DocBlockGenerator extends AbstractGenerator
/**
* Set the word wrap
*
- * @param boolean $value
+ * @param bool $value
* @return \Zend\Code\Generator\DocBlockGenerator
*/
public function setWordWrap($value)
{
- $this->wordwrap = (boolean) $value;
+ $this->wordwrap = (bool) $value;
return $this;
}
/**
* Get the word wrap
*
- * @return boolean
+ * @return bool
*/
public function getWordWrap()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
index af4da382971aedc9c1da99493625b4001fc2e52c..8170a0920b285dde266fb1ff9b12a9789257f568 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
@@ -9,6 +9,8 @@
namespace Zend\Code\Generator;
+use Zend\Stdlib\ArrayObject;
+
class ValueGenerator extends AbstractGenerator
{
/**#@+
@@ -57,13 +59,19 @@ class ValueGenerator extends AbstractGenerator
* @var array
*/
protected $allowedTypes = null;
+ /**
+ * Autodetectable constants
+ * @var ArrayObject
+ */
+ protected $constants = null;
/**
- * @param mixed $value
- * @param string $type
- * @param string $outputMode
+ * @param mixed $value
+ * @param string $type
+ * @param string $outputMode
+ * @param ArrayObject $constants
*/
- public function __construct($value = null, $type = self::TYPE_AUTO, $outputMode = self::OUTPUT_MULTIPLE_LINE)
+ public function __construct($value = null, $type = self::TYPE_AUTO, $outputMode = self::OUTPUT_MULTIPLE_LINE, ArrayObject $constants = null)
{
if ($value !== null) { // strict check is important here if $type = AUTO
$this->setValue($value);
@@ -74,6 +82,72 @@ class ValueGenerator extends AbstractGenerator
if ($outputMode !== self::OUTPUT_MULTIPLE_LINE) {
$this->setOutputMode($outputMode);
}
+ if ($constants !== null) {
+ $this->constants = $constants;
+ } else {
+ $this->constants = new ArrayObject();
+ }
+
+ }
+
+ /**
+ * Init constant list by defined and magic constants
+ */
+ public function initEnvironmentConstants()
+ {
+ $constants = array(
+ '__DIR__',
+ '__FILE__',
+ '__LINE__',
+ '__CLASS__',
+ '__TRAIT__',
+ '__METHOD__',
+ '__FUNCTION__',
+ '__NAMESPACE__',
+ '::'
+ );
+ $constants = array_merge($constants, array_keys(get_defined_constants()), $this->constants->getArrayCopy());
+ $this->constants->exchangeArray($constants);
+ }
+
+ /**
+ * Add constant to list
+ *
+ * @param string $constant
+ *
+ * @return $this
+ */
+ public function addConstant($constant)
+ {
+ $this->constants->append($constant);
+
+ return $this;
+ }
+
+ /**
+ * Delete constant from constant list
+ *
+ * @param string $constant
+ *
+ * @return bool
+ */
+ public function deleteConstant($constant)
+ {
+ if (($index = array_search($constant, $this->constants->getArrayCopy())) !== false) {
+ $this->constants->offsetUnset($index);
+ }
+
+ return $index !== false;
+ }
+
+ /**
+ * Return constant list
+ *
+ * @return ArrayObject
+ */
+ public function getConstants()
+ {
+ return $this->constants;
}
/**
@@ -198,6 +272,11 @@ class ValueGenerator extends AbstractGenerator
case 'boolean':
return self::TYPE_BOOLEAN;
case 'string':
+ foreach ($this->constants as $constant) {
+ if (strpos($value, $constant) !== false) {
+ return self::TYPE_CONSTANT;
+ }
+ }
return self::TYPE_STRING;
case 'double':
case 'float':
@@ -239,7 +318,7 @@ class ValueGenerator extends AbstractGenerator
);
foreach ($rii as $curKey => $curValue) {
if (!$curValue instanceof ValueGenerator) {
- $curValue = new self($curValue);
+ $curValue = new self($curValue, self::TYPE_AUTO, self::OUTPUT_MULTIPLE_LINE, $this->getConstants());
$rii->getSubIterator()->offsetSet($curKey, $curValue);
}
$curValue->setArrayDepth($rii->getDepth());
@@ -304,9 +383,9 @@ class ValueGenerator extends AbstractGenerator
case self::TYPE_OTHER:
default:
throw new Exception\RuntimeException(sprintf(
- 'Type "%s" is unknown or cannot be used as property default value.',
- get_class($value)
- ));
+ 'Type "%s" is unknown or cannot be used as property default value.',
+ get_class($value)
+ ));
}
return $output;
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php b/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php
index 2270398a242e275e15059bc17bcbb99966857e49..dc4a85c8eeecd869b3f5feb0be30646a8f5a36d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php
@@ -54,7 +54,7 @@ class NameInformation
}
/**
- * @return boolean
+ * @return bool
*/
public function hasNamespace()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
index 76e60c9f923085beea11e3c2e3b132c52ea670e0..3f3124931e0561ed162993c8a55e77f6a263c7b3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
@@ -75,7 +75,7 @@ class GenericTag implements TagInterface
}
/**
- * @param integer $position
+ * @param int $position
* @return string
*/
public function returnValue($position)
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
index 6c843e550bcbc744a6f12806ac9692d4630f0b07..761b39c6a1c1e54aae56baed14c4a0e269cae471 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
@@ -9,9 +9,9 @@
namespace Zend\Code\Reflection\DocBlock;
-use Zend\Code\Reflection\Exception;
use Zend\Code\Reflection\DocBlock\Tag\GenericTag;
use Zend\Code\Reflection\DocBlock\Tag\TagInterface;
+use Zend\Code\Reflection\Exception;
class TagManager
{
@@ -83,7 +83,7 @@ class TagManager
/**
* @param string $tagName
- * @return boolean
+ * @return bool
*/
public function hasTag($tagName)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php
index bf5393371445700f8fb403065b8d81edf0280d59..3b2257e927f2380843491d42633784b6f0c606ea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php
@@ -9,10 +9,10 @@
namespace Zend\Code\Reflection;
+use Reflector;
use Zend\Code\Reflection\DocBlock\Tag\TagInterface as DocBlockTagInterface;
use Zend\Code\Reflection\DocBlock\TagManager as DocBlockTagManager;
use Zend\Code\Scanner\DocBlockScanner;
-use Reflector;
class DocBlockReflection implements ReflectionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php
index 19764614efa9f62f37c5730c83c7cf44f675c87c..0ed7fc5524e5f3273018e4cd390ca02eb6317466 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php
@@ -26,9 +26,12 @@ class Util
* @return void
* @throws Exception\InvalidArgumentException
*/
- public static function resolveImports(&$value, $key = null, stdClass $data)
+ public static function resolveImports(&$value, $key = null, stdClass $data = null)
{
- if (!property_exists($data, 'uses') || !property_exists($data, 'namespace')) {
+ if (!is_object($data)
+ || !property_exists($data, 'uses')
+ || !property_exists($data, 'namespace')
+ ) {
throw new Exception\InvalidArgumentException(sprintf(
'%s expects a data object containing "uses" and "namespace" properties; on or both missing',
__METHOD__
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/composer.json b/vendor/zendframework/zendframework/library/Zend/Code/composer.json
index d56f6b7a90c88446e4c0d3c0f0d47d2a1f36f9ef..b970e408f9c894e3f77e39fd0a3348ede8404c20 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Code/composer.json
@@ -24,8 +24,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Config.php b/vendor/zendframework/zendframework/library/Zend/Config/Config.php
index 50a88d60efa1ad49013893dd66067dd4021e7127..badd765d5d7d742c6c489e0bd84ebe5a8f33c202 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Config.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Config.php
@@ -33,7 +33,7 @@ class Config implements Countable, Iterator, ArrayAccess
/**
* Number of elements in configuration data.
*
- * @var integer
+ * @var int
*/
protected $count;
@@ -210,7 +210,7 @@ class Config implements Countable, Iterator, ArrayAccess
* count(): defined by Countable interface.
*
* @see Countable::count()
- * @return integer
+ * @return int
*/
public function count()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Factory.php b/vendor/zendframework/zendframework/library/Zend/Config/Factory.php
index 01c35117f80101196741a0276ae3ab52dd7bd227..39b162a4bc0de692cf5a18a40fd655bb82d01525 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Factory.php
@@ -127,7 +127,7 @@ class Factory
*
* @param string $filename
* @param array|Config $config
- * @return boolean TRUE on success | FALSE on failure
+ * @return bool TRUE on success | FALSE on failure
* @throws Exception\RuntimeException
* @throws Exception\InvalidArgumentException
*/
@@ -256,7 +256,7 @@ class Factory
*
* @param string $extension
* @param string|Writer\AbstractWriter $writer
- * @throw Exception\InvalidArgumentException
+ * @throws Exception\InvalidArgumentException
* @return void
*/
public static function registerWriter($extension, $writer)
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php
index 881eb75a1a7d30b8876ce4be719f2400155eeae8..5c7d69896a47870fef99f38cd1e102e86a1e57c6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php
@@ -48,7 +48,7 @@ abstract class AbstractWriter implements WriterInterface
try {
file_put_contents($filename, $this->toString($config), $flags);
- } catch( \Exception $e ) {
+ } catch (\Exception $e) {
restore_error_handler();
throw $e;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php
index c8a16c76a2e4185ab3ae12fc56ced3de77c69f30..1fffa8f16af3b2e725a3c7aeb618989731abe404 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php
@@ -143,7 +143,7 @@ class Ini extends AbstractWriter
*/
protected function prepareValue($value)
{
- if (is_integer($value) || is_float($value)) {
+ if (is_int($value) || is_float($value)) {
return $value;
} elseif (is_bool($value)) {
return ($value ? 'true' : 'false');
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
index 35717f5178854fcbc2e4a23f8b98f9763ffa48c3..e41c7d31d73f9c6f41c7acd8b0bd86565162ab9f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
@@ -1,4 +1,12 @@
<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
namespace Zend\Config;
use Zend\ServiceManager\AbstractPluginManager;
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/composer.json b/vendor/zendframework/zendframework/library/Zend/Config/composer.json
index d15e7c1a212ea05acc93a70a6e6a0a1e63dbdf3c..73f2c712f4e4afccd50a740130d49c2528bb3209 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Config/composer.json
@@ -16,10 +16,13 @@
"php": ">=5.3.3",
"zendframework/zend-stdlib": "self.version"
},
+ "suggest": {
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php
index e982b63853bd0804bd13eb0927cc06aa795fed68..5cf5ae9d2732279fbd27b51eccdaa58a1fb7c694 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php
@@ -96,8 +96,8 @@ abstract class AbstractAdapter implements AdapterInterface
*/
public function writeAt($text, $x, $y, $color = null, $bgColor = null)
{
- $this->setPos( $x, $y );
- $this->write( $text, $color, $bgColor );
+ $this->setPos($x, $y);
+ $this->write($text, $color, $bgColor);
}
/**
@@ -457,7 +457,7 @@ abstract class AbstractAdapter implements AdapterInterface
*/
public function clearLine()
{
- echo "\r" . str_repeat( " ", $this->getWidth() ) . "\r";
+ echo "\r" . str_repeat(" ", $this->getWidth()) . "\r";
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php
index 9621c828a15ac67a74dbb21c175041b5ee694452..850c8f11fd72181d3d26d72238560fdfbddddb76 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php
@@ -9,9 +9,9 @@
namespace Zend\Console\Adapter;
+use Zend\Console\Charset;
use Zend\Console\Charset\CharsetInterface;
use Zend\Console\Exception;
-use Zend\Console\Charset;
/**
* MS Windows with ANSICON console adapter
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php b/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php
index f2b5ae68a2c85ac2d571433e0432740d4dd7c30f..b3d3ba4da05432a28ff3c8972bba4e7f7882cab2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php
@@ -30,7 +30,6 @@ class Xterm256
* Populate color property with X11-formatted equivalent
*
* @param mixed $color
- * @return void
*/
protected function __construct($color = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Console.php b/vendor/zendframework/zendframework/library/Zend/Console/Console.php
index 0e84cb85200fa1a406a5cb278d73339342b494e2..527684264fadf4774b426df5f7a0c1c9d5682d98 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Console.php
@@ -118,8 +118,8 @@ abstract class Console
public static function isWindows()
{
return
- ( defined('PHP_OS') && ( substr_compare(PHP_OS,'win',0,3,true) === 0) ) ||
- (getenv('OS') != false && substr_compare(getenv('OS'),'windows',0,7,true))
+ (defined('PHP_OS') && (substr_compare(PHP_OS, 'win', 0, 3, true) === 0)) ||
+ (getenv('OS') != false && substr_compare(getenv('OS'), 'windows', 0, 7, true))
;
}
@@ -156,8 +156,8 @@ abstract class Console
*/
public static function overrideIsConsole($flag)
{
- if(null != $flag) {
- $flag = (bool)$flag;
+ if (null != $flag) {
+ $flag = (bool) $flag;
}
static::$isConsole = $flag;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php
index 1b675258cd980dcd9bc24be9b156292b5feb9d46..7ccb28ce0f48037408c88e45dc776bb063968d36 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php
@@ -10,8 +10,8 @@
namespace Zend\Console\Prompt;
use ReflectionClass;
-use Zend\Console\Console;
use Zend\Console\Adapter\AdapterInterface as ConsoleAdapter;
+use Zend\Console\Console;
use Zend\Console\Exception;
abstract class AbstractPrompt implements PromptInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php
index 83f949a17aaca8014781c4a4b5a5f6bbd6b10df8..93399e3d79e10764ac04ec7fc1f9a1ed9e23015f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php
@@ -69,7 +69,7 @@ class Confirm extends Char
public function show()
{
$char = parent::show();
- if($this->ignoreCase) {
+ if ($this->ignoreCase) {
$response = strtolower($char) === strtolower($this->yesChar);
} else {
$response = $char === $this->yesChar;
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php
index c5e2f6e3129e15a76ca04ff9c1b1fb5e19361605..7bb299bb728be3e042871144fedf414fc2189e93 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php
@@ -37,8 +37,8 @@ class Number extends Line
* @param string $promptText The prompt text to display in console
* @param bool $allowEmpty Is empty response allowed?
* @param bool $allowFloat Are floating (non-decimal) numbers allowed?
- * @param integer $min Minimum value (inclusive)
- * @param integer $max Maximum value (inclusive)
+ * @param int $min Minimum value (inclusive)
+ * @param int $max Maximum value (inclusive)
*/
public function __construct(
$promptText = 'Please enter a number: ',
@@ -88,7 +88,7 @@ class Number extends Line
} elseif (!is_numeric($number)) {
$this->getConsole()->writeLine("$number is not a number\n");
$valid = false;
- } elseif (!$this->allowFloat && (round($number) != $number) ) {
+ } elseif (!$this->allowFloat && (round($number) != $number)) {
$this->getConsole()->writeLine("Please enter a non-floating number, i.e. " . round($number) . "\n");
$valid = false;
} elseif ($this->max !== null && $number > $this->max) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Response.php b/vendor/zendframework/zendframework/library/Zend/Console/Response.php
index 50426c10de53f9fe8e76c5aabc666b83c75d2f55..df580c9800a2f3a20f0d3c0ed997b4e1d8a1a95a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Response.php
@@ -34,7 +34,7 @@ class Response extends Message implements ResponseInterface
/**
* Set the error level that will be returned to shell.
*
- * @param integer $errorLevel
+ * @param int $errorLevel
* @return Response
*/
public function setErrorLevel($errorLevel)
@@ -46,7 +46,7 @@ class Response extends Message implements ResponseInterface
/**
* Get response error level that will be returned to shell.
*
- * @return integer|0
+ * @return int|0
*/
public function getErrorLevel()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/composer.json b/vendor/zendframework/zendframework/library/Zend/Console/composer.json
index c85e9e9a38ffd2b5fe3339325109575a8b159912..be5bbf50a91b08eb3aab9cb58cd63ed34a7c0c2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Console/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php b/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
index 6aa55f30fab44dfb2c2b86ebd1a8c2251acd8b52..25d2ab5367b17d132d4138613ce5c52c6d95fb6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
@@ -46,7 +46,7 @@ class BlockCipher
/**
* Check if the salt has been set
*
- * @var boolean
+ * @var bool
*/
protected $saltSetted = false;
@@ -162,12 +162,12 @@ class BlockCipher
/**
* Set the number of iterations for Pbkdf2
*
- * @param integer $num
+ * @param int $num
* @return BlockCipher
*/
public function setKeyIteration($num)
{
- $this->keyIteration = (integer) $num;
+ $this->keyIteration = (int) $num;
return $this;
}
@@ -175,7 +175,7 @@ class BlockCipher
/**
* Get the number of iterations for Pbkdf2
*
- * @return integer
+ * @return int
*/
public function getKeyIteration()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php
index 88d417b03a6f74022b99d30b8cc7cd563b5fd0c3..a06f2c93049b5b2b76654588ffa04f26d868423e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php
@@ -44,7 +44,7 @@ class Hash
*
* @param string $hash
* @param bool $output
- * @return integer
+ * @return int
*/
public static function getOutputSize($hash, $output = self::OUTPUT_STRING)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php
index 6474efa0f2456d1a30ba4a5f444caedf53778ad7..b0aed19e54d85d6a4b7c87c0cc3115b02e623156 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php
@@ -57,7 +57,7 @@ class Hmac
*
* @param string $hash
* @param bool $output
- * @return integer
+ * @return int
*/
public static function getOutputSize($hash, $output = self::OUTPUT_STRING)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
index d0a66c528d5e7dbd09851945c0efb30818457673..74748f9d9f15562c4e7c377f860352b966713ac6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
@@ -22,8 +22,8 @@ class Pbkdf2
* @param string $hash The hash algorithm to be used by HMAC
* @param string $password The source password/key
* @param string $salt
- * @param integer $iterations The number of iterations
- * @param integer $length The output size
+ * @param int $iterations The number of iterations
+ * @param int $length The output size
* @throws Exception\InvalidArgumentException
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
index ed6d43a9d72e06c2d0a1e7f2d04a766dae7e6fed..d7da1bb11548f6a2e2aa50127913bcfbc3b43fd7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
@@ -45,7 +45,7 @@ class SaltedS2k
*
* @param string $hash The hash algorithm to be used by HMAC
* @param string $password The source password/key
- * @param integer $bytes The output size in bytes
+ * @param int $bytes The output size in bytes
* @param string $salt The salt of the algorithm
* @throws Exception\InvalidArgumentException
* @return string
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php
index f5895cb98f8ed825c015dcd7df67c9ac460d0beb..af04a4c9ae8c11f74d2490129fc7670664371348 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php
@@ -24,10 +24,10 @@ abstract class Scrypt
*
* @param string $password
* @param string $salt
- * @param integer $n CPU cost
- * @param integer $r Memory cost
- * @param integer $p parallelization cost
- * @param integer $length size of the output key
+ * @param int $n CPU cost
+ * @param int $r Memory cost
+ * @param int $p parallelization cost
+ * @param int $length size of the output key
* @return string
*/
public static function calc($password, $salt, $n, $r, $p, $length)
@@ -63,8 +63,8 @@ abstract class Scrypt
* scryptROMix
*
* @param string $b
- * @param integer $n
- * @param integer $r
+ * @param int $n
+ * @param int $r
* @return string
* @see https://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01#section-4
*/
@@ -88,7 +88,7 @@ abstract class Scrypt
* scryptBlockMix
*
* @param string $b
- * @param integer $r
+ * @param int $r
* @return string
* @see https://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01#section-3
*/
@@ -308,7 +308,7 @@ abstract class Scrypt
* Each block B is a string of 64 bytes.
*
* @param string $b
- * @return integer
+ * @return int
* @see https://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01#section-4
*/
protected static function integerify($b)
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php
index 793df073d90af61f240bfab204f95ab846467694..63b39b9d07cf14925913435d2fecc819e5ddb0a4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php
@@ -121,7 +121,7 @@ class Apache implements PasswordInterface
*
* @param string $password
* @param string $hash
- * @return boolean
+ * @return bool
*/
public function verify($password, $hash)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
index 4e4dbfe41f0814208e995a958f145ac75a79d1a4..d1afcc12b51303f53d19fda98740c2252b81e706 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
@@ -31,7 +31,7 @@ class Bcrypt implements PasswordInterface
protected $salt;
/**
- * @var boolean
+ * @var bool
*/
protected $backwardCompatibility = false;
@@ -118,7 +118,7 @@ class Bcrypt implements PasswordInterface
/**
* Set the cost parameter
*
- * @param integer|string $cost
+ * @param int|string $cost
* @throws Exception\InvalidArgumentException
* @return Bcrypt
*/
@@ -177,19 +177,19 @@ class Bcrypt implements PasswordInterface
/**
* Set the backward compatibility $2a$ instead of $2y$ for PHP 5.3.7+
*
- * @param boolean $value
+ * @param bool $value
* @return Bcrypt
*/
public function setBackwardCompatibility($value)
{
- $this->backwardCompatibility = (boolean) $value;
+ $this->backwardCompatibility = (bool) $value;
return $this;
}
/**
* Get the backward compatibility
*
- * @return boolean
+ * @return bool
*/
public function getBackwardCompatibility()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php
index 873ca3f051390f779c2f04fd40ca34fbd0d8e43c..03b1f177514611ffbe206de89996b8323db56e87 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php
@@ -10,8 +10,8 @@
namespace Zend\Crypt\PublicKey;
use Traversable;
-use Zend\Crypt\PublicKey\RsaOptions;
use Zend\Crypt\PublicKey\Rsa\Exception;
+use Zend\Crypt\PublicKey\RsaOptions;
use Zend\Stdlib\ArrayUtils;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php
index 9f82a5101a8584aa1d72ddcca64b015c485880fa..776408088fa6c9d6a3ae3fe40d3ef1081e644f00 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php
@@ -209,7 +209,7 @@ class Mcrypt implements SymmetricInterface
/**
* Get the maximum key size for the selected cipher and mode of operation
*
- * @return integer
+ * @return int
*/
public function getKeySize()
{
@@ -374,7 +374,7 @@ class Mcrypt implements SymmetricInterface
/**
* Get the salt (IV) size
*
- * @return integer
+ * @return int
*/
public function getSaltSize()
{
@@ -488,7 +488,7 @@ class Mcrypt implements SymmetricInterface
/**
* Get the block size
*
- * @return integer
+ * @return int
*/
public function getBlockSize()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json b/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json
index 9e718313973d36217ba4b25bcedd49de7404683b..172f46a0d45143051bbaed5edce73667067953f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
index ec54def4b9c670e86732d533f3d6da74880ce795..8a948b67af69bc320a8b84b3877cb865a01d7c9d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
@@ -309,7 +309,7 @@ class Adapter implements AdapterInterface, Profiler\ProfilerAwareInterface
/**
* @param Driver\DriverInterface $driver
- * @return Platform\PlatformInterface
+ * @return Platform\PlatformInterface
*/
protected function createPlatform($parameters)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..db99251fe1ceeb7bcdde79f119077ea77ba06935
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Adapter;
+
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Database adapter abstract service factory.
+ *
+ * Allows configuring several database instances (such as writer and reader).
+ */
+class AdapterAbstractServiceFactory implements AbstractFactoryInterface
+{
+ /**
+ * @var array
+ */
+ protected $config;
+
+ /**
+ * Can we create an adapter by the requested name?
+ *
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return bool
+ */
+ public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $config = $this->getConfig($services);
+ if (empty($config)) {
+ return false;
+ }
+
+ return (
+ isset($config[$requestedName])
+ && is_array($config[$requestedName])
+ && !empty($config[$requestedName])
+ );
+ }
+
+ /**
+ * Create a DB adapter
+ *
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return Adapter
+ */
+ public function createServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $config = $this->getConfig($services);
+ return new Adapter($config[$requestedName]);
+ }
+
+ /**
+ * Get db configuration, if any
+ *
+ * @param ServiceLocatorInterface $services
+ * @return array
+ */
+ protected function getConfig(ServiceLocatorInterface $services)
+ {
+ if ($this->config !== null) {
+ return $this->config;
+ }
+
+ if (!$services->has('Config')) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $config = $services->get('Config');
+ if (!isset($config['db'])
+ || !is_array($config['db'])
+ ) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $config = $config['db'];
+ if (!isset($config['adapters'])
+ || !is_array($config['adapters'])
+ ) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $this->config = $config['adapters'];
+ return $this->config;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
index f529b849887c351f5ddc1a28e65ac4ab1363aeb1..1beb4fb2a2b2fa985bc370ba92b352da4b669beb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
@@ -79,7 +79,7 @@ interface ConnectionInterface
* Get last generated id
*
* @param null $name Ignored
- * @return integer
+ * @return int
*/
public function getLastGeneratedValue($name = null);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
index 2c9dbd9b2798d33d2a1f29b0de3cdf24abd8bef1..ab99d05d87d75a621fd5ce396ef4d2dbf7a22942 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
@@ -275,7 +275,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
* Get last generated id
*
* @param null $name Ignored
- * @return integer
+ * @return int
*/
public function getLastGeneratedValue($name = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
index 31a930c581c68ddf3539e3cf7ddf130f38ed1c8c..fab7c5b779b1653f0c32d4a049f412c0642616d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
@@ -33,9 +33,8 @@ class IbmDb2 implements DriverInterface, Profiler\ProfilerAwareInterface
/**
* @param array|Connection|resource $connection
- * @param null|Statement $statementPrototype
- * @param null|Result $resultPrototype
- * @param string $features
+ * @param null|Statement $statementPrototype
+ * @param null|Result $resultPrototype
*/
public function __construct($connection, Statement $statementPrototype = null, Result $resultPrototype = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
index 5a5046fc2be62a6f5b0501f71f03c587a17d5ca9..711917c510e249d5b5c135a78793f34ae93d3e81 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
@@ -145,7 +145,7 @@ class Result implements ResultInterface
/**
* Get affected rows
*
- * @return integer
+ * @return int
*/
public function getAffectedRows()
{
@@ -175,7 +175,7 @@ class Result implements ResultInterface
/**
* Get field count
*
- * @return integer
+ * @return int
*/
public function getFieldCount()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
index 4683fb2f39bb0f411b15e917804f554c10714aa9..362f7a8896fbdd3c6883ce355adbd49b0a66947c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
@@ -10,8 +10,8 @@
namespace Zend\Db\Adapter\Driver\IbmDb2;
use Zend\Db\Adapter\Driver\StatementInterface;
-use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Exception;
+use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Profiler;
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
index c8525ff6404b5755e756f36066593416df77423a..190000dea4663ba1ad9fc6a76172dd06249fde63 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
@@ -132,7 +132,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
/**
* Set resource
*
- * @param mysqli $resource
+ * @param \mysqli $resource
* @return Connection
*/
public function setResource(\mysqli $resource)
@@ -328,7 +328,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
* Get last generated id
*
* @param null $name Ignored
- * @return integer
+ * @return int
*/
public function getLastGeneratedValue($name = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
index 3c2877618ce23dd3cc310d09408940cb50935089..d0ec8191c4cd35e12f70c9e6d021b2382ed16508 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
@@ -145,7 +145,7 @@ class Result implements
/**
* Get affected rows
*
- * @return integer
+ * @return int
*/
public function getAffectedRows()
{
@@ -310,7 +310,7 @@ class Result implements
* Count
*
* @throws Exception\RuntimeException
- * @return integer
+ * @return int
*/
public function count()
{
@@ -323,7 +323,7 @@ class Result implements
/**
* Get field count
*
- * @return integer
+ * @return int
*/
public function getFieldCount()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
index 5c4830e6a5bdbda4781eaf80b834bb51d5143dd4..6ff5817e2aa9e28b9bee5e306e9c154e3dd1d4b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
@@ -40,7 +40,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
/**
* In transaction
*
- * @var boolean
+ * @var bool
*/
protected $inTransaction = false;
@@ -212,7 +212,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
/**
* Is connected
*
- * @return boolean
+ * @return bool
*/
public function isConnected()
{
@@ -245,7 +245,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
/**
* In transaction
*
- * @return boolean
+ * @return bool
*/
public function inTransaction()
{
@@ -335,7 +335,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
* Get last generated id
*
* @param null $name Ignored
- * @return integer
+ * @return int
*/
public function getLastGeneratedValue($name = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
index 5e9996dad1370a532707468299b9cb6b20bb2f38..0e8d49e305154fea5d71419c51b5198e1b25305a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
@@ -195,7 +195,8 @@ class Oci8 implements DriverInterface, Profiler\ProfilerAwareInterface
}
/**
- * @param resource $resource
+ * @param resource $resource
+ * @param null $isBuffered
* @return Result
*/
public function createResult($resource, $isBuffered = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
index a465bd3aa3bd4c9a806feaccd94cc6c16f058f5b..2033d12b6d7fed39eb896980c4bf00f38dbe0539 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
@@ -107,7 +107,7 @@ class Result implements \Iterator, ResultInterface
/**
* Is query result?
*
- * @return boolean
+ * @return bool
*/
public function isQueryResult()
{
@@ -116,7 +116,7 @@ class Result implements \Iterator, ResultInterface
/**
* Get affected rows
- * @return integer
+ * @return int
*/
public function getAffectedRows()
{
@@ -141,18 +141,15 @@ class Result implements \Iterator, ResultInterface
/**
* Load from oci8 result
*
- * @return boolean
+ * @return bool
*/
protected function loadData()
{
- $this->currentComplete = false;
- $this->currentData = null;
-
+ $this->currentComplete = true;
$this->currentData = oci_fetch_assoc($this->resource);
if ($this->currentData !== false) {
$this->position++;
- $this->currentComplete = true;
return true;
}
return false;
@@ -187,12 +184,12 @@ class Result implements \Iterator, ResultInterface
/**
* Valid
- * @return boolean
+ * @return bool
*/
public function valid()
{
if ($this->currentComplete) {
- return true;
+ return ($this->currentData !== false);
}
return $this->loadData();
@@ -200,7 +197,7 @@ class Result implements \Iterator, ResultInterface
/**
* Count
- * @return integer
+ * @return int
*/
public function count()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
index ead25cfd7d72b05dcaf8abbb6f639a243ad9990e..8dc7388b233e9807a7af12d429028cec263cd538 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
@@ -52,7 +52,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
/**
* Is prepared
*
- * @var boolean
+ * @var bool
*/
protected $isPrepared = false;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
index 03cbe3e86873b7bab9943d938f8a7eb7e27d9baf..2ece67590095a0265f005586eb72e5af466b69c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
@@ -419,7 +419,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
* Get last generated id
*
* @param string $name
- * @return integer|null|false
+ * @return int|null|false
*/
public function getLastGeneratedValue($name = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
index 56da49440e771cbcd5dc36227e47d061cc4da16d..bcae2c6fa551a0238c9ebb0091def097483f9575 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
@@ -302,8 +302,8 @@ class Pdo implements DriverInterface, DriverFeatureInterface, Profiler\ProfilerA
/**
* @return mixed
*/
- public function getLastGeneratedValue()
+ public function getLastGeneratedValue($name = null)
{
- return $this->connection->getLastGeneratedValue();
+ return $this->connection->getLastGeneratedValue($name);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php
index 81d8e79145cc0d51aa735250973b1897905f905c..b73c5b5d31c94701f8ffbe6ea89370e4bb1edca4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php
@@ -172,7 +172,7 @@ class Result implements Iterator, ResultInterface
/**
* Count
*
- * @return integer
+ * @return int
*/
public function count()
{
@@ -208,7 +208,7 @@ class Result implements Iterator, ResultInterface
/**
* Get affected rows
*
- * @return integer
+ * @return int
*/
public function getAffectedRows()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
index 98dab06eb6dea487c057d4fc796b40a524e26075..96906793761a085b1d4070fce7ca252ba03e9a91 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
@@ -218,7 +218,16 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
public function beginTransaction()
{
- // TODO: Implement beginTransaction() method.
+ if ($this->inTransaction) {
+ throw new Exception\RuntimeException('Nested transactions are not supported');
+ }
+
+ if (!$this->isConnected()) {
+ $this->connect();
+ }
+
+ pg_query($this->resource, 'BEGIN');
+ $this->inTransaction = true;
}
/**
@@ -226,7 +235,12 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
public function commit()
{
- // TODO: Implement commit() method.
+ if (!$this->inTransaction) {
+ return; // We ignore attempts to commit non-existing transaction
+ }
+
+ pg_query($this->resource, 'COMMIT');
+ $this->inTransaction = false;
}
/**
@@ -234,7 +248,12 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
public function rollback()
{
- // TODO: Implement rollback() method.
+ if (!$this->inTransaction) {
+ return;
+ }
+
+ pg_query($this->resource, 'ROLLBACK');
+ $this->inTransaction = false;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php
index 78994b8ef0c90747441aa9b36163b36c5c977ece..e0fa5954ddd650651e950eb2893fc12be474ad46 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php
@@ -40,7 +40,7 @@ interface ResultInterface extends
/**
* Get affected rows
*
- * @return integer
+ * @return int
*/
public function getAffectedRows();
@@ -61,7 +61,7 @@ interface ResultInterface extends
/**
* Get field count
*
- * @return integer
+ * @return int
*/
public function getFieldCount();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
index 2de472730419931ecba492f18f0dcf4b6702cc97..ac790652cef1ed6dfdf72a7ee22d6c07e324f8ce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
@@ -9,8 +9,8 @@
namespace Zend\Db\Adapter\Driver\Sqlsrv;
-use Zend\Db\Adapter\Driver\Sqlsrv\Exception\ErrorException;
use Zend\Db\Adapter\Driver\ConnectionInterface;
+use Zend\Db\Adapter\Driver\Sqlsrv\Exception\ErrorException;
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
index 9e88875b7aef55689f55d4e3734cf0ccd5df3d6e..3018600083e6d440b01d0dc773b0d920aaf807f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
@@ -32,7 +32,7 @@ class Result implements \Iterator, ResultInterface
/**
*
- * @var integer
+ * @var int
*/
protected $position = -1;
@@ -160,7 +160,7 @@ class Result implements \Iterator, ResultInterface
/**
* Count
*
- * @return integer
+ * @return int
*/
public function count()
{
@@ -191,7 +191,7 @@ class Result implements \Iterator, ResultInterface
/**
* Get affected rows
*
- * @return integer
+ * @return int
*/
public function getAffectedRows()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
index f7da7c092311b8fa5b2479e5f236dddfce5da097..8745c412b55014be774bafa98393372068d53df9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
@@ -85,7 +85,7 @@ class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
/**
* Offset set
*
- * @param string|integer $name
+ * @param string|int $name
* @param mixed $value
* @param mixed $errata
*/
@@ -154,7 +154,7 @@ class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
/**
* Offset set errata
*
- * @param string|integer $name
+ * @param string|int $name
* @param mixed $errata
*/
public function offsetSetErrata($name, $errata)
@@ -168,7 +168,7 @@ class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
/**
* Offset get errata
*
- * @param string|integer $name
+ * @param string|int $name
* @throws Exception\InvalidArgumentException
* @return mixed
*/
@@ -186,7 +186,7 @@ class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
/**
* Offset has errata
*
- * @param string|integer $name
+ * @param string|int $name
* @return bool
*/
public function offsetHasErrata($name)
@@ -200,7 +200,7 @@ class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
/**
* Offset unset errata
*
- * @param string|integer $name
+ * @param string|int $name
* @throws Exception\InvalidArgumentException
*/
public function offsetUnsetErrata($name)
@@ -247,7 +247,7 @@ class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
/**
* count
*
- * @return integer
+ * @return int
*/
public function count()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php
index 2d6da40adc80facf214ee8f92304408e19adf50a..2eddb8e78ce766a3ea0e7e382af6ee9a3530afee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php
@@ -87,7 +87,7 @@ interface PlatformInterface
* Quote identifier in fragment
*
* @param string $identifier
- * @param array $safeWords
+ * @param array $additionalSafeWords
* @return string
*/
public function quoteIdentifierInFragment($identifier, array $additionalSafeWords = array());
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php
index 6e1bc09d890234ba7c0b462a7eafe60e23c34008..71247a5fc4140cf364082366835a97f67498a5f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php
@@ -10,8 +10,8 @@
namespace Zend\Db\Adapter\Platform;
use Zend\Db\Adapter\Driver\DriverInterface;
-use Zend\Db\Adapter\Driver\Pgsql;
use Zend\Db\Adapter\Driver\Pdo;
+use Zend\Db\Adapter\Driver\Pgsql;
use Zend\Db\Adapter\Exception;
class Postgresql implements PlatformInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
index 56e9cc54ff8175690313a8ce0d3a4a3fb4804031..2d24234918a86b3e444955afb7f81aa1c81fe7cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
@@ -34,8 +34,8 @@ class SqlServer implements PlatformInterface
public function setDriver($driver)
{
// handle Zend_Db drivers
- if (($driver instanceof Pdo\Pdo && $driver->getDatabasePlatformName() == 'Sqlsrv')
- || (($driver instanceof \PDO && $driver->getAttribute(\PDO::ATTR_DRIVER_NAME) == 'sqlsrv'))
+ if (($driver instanceof Pdo\Pdo && in_array($driver->getDatabasePlatformName(), array('Sqlsrv', 'Dblib')))
+ || (($driver instanceof \PDO && in_array($driver->getAttribute(\PDO::ATTR_DRIVER_NAME), array('sqlsrv', 'dblib'))))
) {
$this->resource = $driver;
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php
index c0bdbc82c4359aae0f7b685fa21e196f32112692..c242e5171925424897e9d2876e3875822987ef42 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php
@@ -56,13 +56,13 @@ class ColumnObject
/**
*
- * @var integer
+ * @var int
*/
protected $characterMaximumLength = null;
/**
*
- * @var integer
+ * @var int
*/
protected $characterOctetLength = null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php
index de5f366e31b134f6d9cbed9a938c9a258b1a13d8..180e37dae32a123749496696efee5f6a7094a2b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php
@@ -47,32 +47,32 @@ class MysqlMetadata extends AbstractSource
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('T','TABLE_NAME'),
- array('T','TABLE_TYPE'),
- array('V','VIEW_DEFINITION'),
- array('V','CHECK_OPTION'),
- array('V','IS_UPDATABLE'),
+ array('T', 'TABLE_NAME'),
+ array('T', 'TABLE_TYPE'),
+ array('V', 'VIEW_DEFINITION'),
+ array('V', 'CHECK_OPTION'),
+ array('V', 'IS_UPDATABLE'),
);
array_walk($isColumns, function (&$c) use ($p) { $c = $p->quoteIdentifierChain($c); });
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . 'T'
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . 'T'
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','VIEWS')) . ' V'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('V','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('V','TABLE_NAME'))
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'VIEWS')) . ' V'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('V', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('V', 'TABLE_NAME'))
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
@@ -100,37 +100,37 @@ class MysqlMetadata extends AbstractSource
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('C','ORDINAL_POSITION'),
- array('C','COLUMN_DEFAULT'),
- array('C','IS_NULLABLE'),
- array('C','DATA_TYPE'),
- array('C','CHARACTER_MAXIMUM_LENGTH'),
- array('C','CHARACTER_OCTET_LENGTH'),
- array('C','NUMERIC_PRECISION'),
- array('C','NUMERIC_SCALE'),
- array('C','COLUMN_NAME'),
- array('C','COLUMN_TYPE'),
+ array('C', 'ORDINAL_POSITION'),
+ array('C', 'COLUMN_DEFAULT'),
+ array('C', 'IS_NULLABLE'),
+ array('C', 'DATA_TYPE'),
+ array('C', 'CHARACTER_MAXIMUM_LENGTH'),
+ array('C', 'CHARACTER_OCTET_LENGTH'),
+ array('C', 'NUMERIC_PRECISION'),
+ array('C', 'NUMERIC_SCALE'),
+ array('C', 'COLUMN_NAME'),
+ array('C', 'COLUMN_TYPE'),
);
array_walk($isColumns, function (&$c) use ($p) { $c = $p->quoteIdentifierChain($c); });
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . 'T'
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','COLUMNS')) . 'C'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('C','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('C','TABLE_NAME'))
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . 'T'
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'COLUMNS')) . 'C'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('C', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('C', 'TABLE_NAME'))
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')'
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
. ' = ' . $p->quoteTrustedValue($table);
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
@@ -174,16 +174,16 @@ class MysqlMetadata extends AbstractSource
$this->prepareDataHierarchy('constraints', $schema, $table);
$isColumns = array(
- array('T','TABLE_NAME'),
- array('TC','CONSTRAINT_NAME'),
- array('TC','CONSTRAINT_TYPE'),
- array('KCU','COLUMN_NAME'),
- array('RC','MATCH_OPTION'),
- array('RC','UPDATE_RULE'),
- array('RC','DELETE_RULE'),
- array('KCU','REFERENCED_TABLE_SCHEMA'),
- array('KCU','REFERENCED_TABLE_NAME'),
- array('KCU','REFERENCED_COLUMN_NAME'),
+ array('T', 'TABLE_NAME'),
+ array('TC', 'CONSTRAINT_NAME'),
+ array('TC', 'CONSTRAINT_TYPE'),
+ array('KCU', 'COLUMN_NAME'),
+ array('RC', 'MATCH_OPTION'),
+ array('RC', 'UPDATE_RULE'),
+ array('RC', 'DELETE_RULE'),
+ array('KCU', 'REFERENCED_TABLE_SCHEMA'),
+ array('KCU', 'REFERENCED_TABLE_NAME'),
+ array('KCU', 'REFERENCED_COLUMN_NAME'),
);
$p = $this->adapter->getPlatform();
@@ -193,49 +193,49 @@ class MysqlMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . ' T'
-
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLE_CONSTRAINTS')) . ' TC'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('TC','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('TC','TABLE_NAME'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','KEY_COLUMN_USAGE')) . ' KCU'
- . ' ON ' . $p->quoteIdentifierChain(array('TC','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('TC','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_NAME'))
- . ' AND ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','CONSTRAINT_NAME'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','REFERENTIAL_CONSTRAINTS')) . ' RC'
- . ' ON ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_NAME'))
-
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . ' T'
+
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLE_CONSTRAINTS')) . ' TC'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('TC', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('TC', 'TABLE_NAME'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'KEY_COLUMN_USAGE')) . ' KCU'
+ . ' ON ' . $p->quoteIdentifierChain(array('TC', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('TC', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_NAME'))
+ . ' AND ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'CONSTRAINT_NAME'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'REFERENTIAL_CONSTRAINTS')) . ' RC'
+ . ' ON ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('RC', 'CONSTRAINT_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('RC', 'CONSTRAINT_NAME'))
+
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
. ' = ' . $p->quoteTrustedValue($table)
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
- $sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_TYPE'))
+ $sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_TYPE'))
. " WHEN 'PRIMARY KEY' THEN 1"
. " WHEN 'UNIQUE' THEN 2"
. " WHEN 'FOREIGN KEY' THEN 3"
. " ELSE 4 END"
- . ', ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_NAME'))
- . ', ' . $p->quoteIdentifierChain(array('KCU','ORDINAL_POSITION'));
+ . ', ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_NAME'))
+ . ', ' . $p->quoteIdentifierChain(array('KCU', 'ORDINAL_POSITION'));
$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
@@ -285,9 +285,9 @@ class MysqlMetadata extends AbstractSource
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('TC','TABLE_NAME'),
- array('TC','CONSTRAINT_NAME'),
- array('TC','CONSTRAINT_TYPE'),
+ array('TC', 'TABLE_NAME'),
+ array('TC', 'CONSTRAINT_NAME'),
+ array('TC', 'CONSTRAINT_TYPE'),
);
array_walk($isColumns, function (&$c) use ($p) {
@@ -295,20 +295,20 @@ class MysqlMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . 'T'
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLE_CONSTRAINTS')) . 'TC'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('TC','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('TC','TABLE_NAME'))
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . 'T'
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLE_CONSTRAINTS')) . 'TC'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('TC', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('TC', 'TABLE_NAME'))
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
@@ -333,10 +333,10 @@ class MysqlMetadata extends AbstractSource
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('T','TABLE_NAME'),
- array('KCU','CONSTRAINT_NAME'),
- array('KCU','COLUMN_NAME'),
- array('KCU','ORDINAL_POSITION'),
+ array('T', 'TABLE_NAME'),
+ array('KCU', 'CONSTRAINT_NAME'),
+ array('KCU', 'COLUMN_NAME'),
+ array('KCU', 'ORDINAL_POSITION'),
);
array_walk($isColumns, function (&$c) use ($p) {
@@ -344,22 +344,22 @@ class MysqlMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . 'T'
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . 'T'
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','KEY_COLUMN_USAGE')) . 'KCU'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_NAME'))
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'KEY_COLUMN_USAGE')) . 'KCU'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_NAME'))
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
@@ -373,24 +373,20 @@ class MysqlMetadata extends AbstractSource
$this->data['constraint_keys'][$schema] = $data;
}
- protected function loadConstraintReferences($schema)
+ protected function loadConstraintReferences($table, $schema)
{
- if (isset($this->data['constraint_references'][$schema])) {
- return;
- }
-
- $this->prepareDataHierarchy('constraint_references', $schema);
+ parent::loadConstraintReferences($table, $schema);
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('RC','TABLE_NAME'),
- array('RC','CONSTRAINT_NAME'),
- array('RC','UPDATE_RULE'),
- array('RC','DELETE_RULE'),
- array('KCU','REFERENCED_TABLE_SCHEMA'),
- array('KCU','REFERENCED_TABLE_NAME'),
- array('KCU','REFERENCED_COLUMN_NAME'),
+ array('RC', 'TABLE_NAME'),
+ array('RC', 'CONSTRAINT_NAME'),
+ array('RC', 'UPDATE_RULE'),
+ array('RC', 'DELETE_RULE'),
+ array('KCU', 'REFERENCED_TABLE_SCHEMA'),
+ array('KCU', 'REFERENCED_TABLE_NAME'),
+ array('KCU', 'REFERENCED_COLUMN_NAME'),
);
array_walk($isColumns, function (&$c) use ($p) {
@@ -398,30 +394,30 @@ class MysqlMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . 'FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . 'T'
-
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','REFERENTIAL_CONSTRAINTS')) . 'RC'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('RC','TABLE_NAME'))
-
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','KEY_COLUMN_USAGE')) . 'KCU'
- . ' ON ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('RC','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_NAME'))
- . ' AND ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','CONSTRAINT_NAME'))
-
- . 'WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . 'FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . 'T'
+
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'REFERENTIAL_CONSTRAINTS')) . 'RC'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('RC', 'CONSTRAINT_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('RC', 'TABLE_NAME'))
+
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'KEY_COLUMN_USAGE')) . 'KCU'
+ . ' ON ' . $p->quoteIdentifierChain(array('RC', 'CONSTRAINT_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('RC', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_NAME'))
+ . ' AND ' . $p->quoteIdentifierChain(array('RC', 'CONSTRAINT_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'CONSTRAINT_NAME'))
+
+ . 'WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
@@ -470,7 +466,7 @@ class MysqlMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TRIGGERS'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TRIGGERS'))
. ' WHERE ';
if ($schema != self::DEFAULT_SCHEMA) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
index b52b39048c27938ad3f463237b3fdf599fbcd506..b7545b00948c714e24a53c597f07bfa3c98ac791 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
@@ -49,11 +49,11 @@ class PostgresqlMetadata extends AbstractSource
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('t','table_name'),
- array('t','table_type'),
- array('v','view_definition'),
- array('v','check_option'),
- array('v','is_updatable'),
+ array('t', 'table_name'),
+ array('t', 'table_type'),
+ array('v', 'view_definition'),
+ array('v', 'check_option'),
+ array('v', 'is_updatable'),
);
array_walk($isColumns, function (&$c) use ($p) { $c = $p->quoteIdentifierChain($c); });
@@ -62,19 +62,19 @@ class PostgresqlMetadata extends AbstractSource
. ' FROM ' . $p->quoteIdentifierChain(array('information_schema', 'tables')) . ' t'
. ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema', 'views')) . ' v'
- . ' ON ' . $p->quoteIdentifierChain(array('t','table_schema'))
- . ' = ' . $p->quoteIdentifierChain(array('v','table_schema'))
- . ' AND ' . $p->quoteIdentifierChain(array('t','table_name'))
- . ' = ' . $p->quoteIdentifierChain(array('v','table_name'))
+ . ' ON ' . $p->quoteIdentifierChain(array('t', 'table_schema'))
+ . ' = ' . $p->quoteIdentifierChain(array('v', 'table_schema'))
+ . ' AND ' . $p->quoteIdentifierChain(array('t', 'table_name'))
+ . ' = ' . $p->quoteIdentifierChain(array('v', 'table_name'))
- . ' WHERE ' . $p->quoteIdentifierChain(array('t','table_type'))
+ . ' WHERE ' . $p->quoteIdentifierChain(array('t', 'table_type'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('t', 'table_schema'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('t', 'table_schema'))
. ' != \'information_schema\'';
}
@@ -160,17 +160,17 @@ class PostgresqlMetadata extends AbstractSource
$this->prepareDataHierarchy('constraints', $schema, $table);
$isColumns = array(
- array('t','table_name'),
- array('tc','constraint_name'),
- array('tc','constraint_type'),
- array('kcu','column_name'),
- array('cc','check_clause'),
- array('rc','match_option'),
- array('rc','update_rule'),
- array('rc','delete_rule'),
- array('referenced_table_schema' => 'kcu2','table_schema'),
- array('referenced_table_name' => 'kcu2','table_name'),
- array('referenced_column_name' => 'kcu2','column_name'),
+ array('t', 'table_name'),
+ array('tc', 'constraint_name'),
+ array('tc', 'constraint_type'),
+ array('kcu', 'column_name'),
+ array('cc', 'check_clause'),
+ array('rc', 'match_option'),
+ array('rc', 'update_rule'),
+ array('rc', 'delete_rule'),
+ array('referenced_table_schema' => 'kcu2', 'table_schema'),
+ array('referenced_table_name' => 'kcu2', 'table_name'),
+ array('referenced_column_name' => 'kcu2', 'column_name'),
);
$p = $this->adapter->getPlatform();
@@ -184,63 +184,63 @@ class PostgresqlMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('information_schema','tables')) . ' t'
-
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('information_schema','table_constraints')) . ' tc'
- . ' ON ' . $p->quoteIdentifierChain(array('t','table_schema'))
- . ' = ' . $p->quoteIdentifierChain(array('tc','table_schema'))
- . ' AND ' . $p->quoteIdentifierChain(array('t','table_name'))
- . ' = ' . $p->quoteIdentifierChain(array('tc','table_name'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema','key_column_usage')) . ' kcu'
- . ' ON ' . $p->quoteIdentifierChain(array('tc','table_schema'))
- . ' = ' . $p->quoteIdentifierChain(array('kcu','table_schema'))
- . ' AND ' . $p->quoteIdentifierChain(array('tc','table_name'))
- . ' = ' . $p->quoteIdentifierChain(array('kcu','table_name'))
- . ' AND ' . $p->quoteIdentifierChain(array('tc','constraint_name'))
- . ' = ' . $p->quoteIdentifierChain(array('kcu','constraint_name'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema','check_constraints')) . ' cc'
- . ' ON ' . $p->quoteIdentifierChain(array('tc','constraint_schema'))
- . ' = ' . $p->quoteIdentifierChain(array('cc','constraint_schema'))
- . ' AND ' . $p->quoteIdentifierChain(array('tc','constraint_name'))
- . ' = ' . $p->quoteIdentifierChain(array('cc','constraint_name'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema','referential_constraints')) . ' rc'
- . ' ON ' . $p->quoteIdentifierChain(array('tc','constraint_schema'))
- . ' = ' . $p->quoteIdentifierChain(array('rc','constraint_schema'))
- . ' AND ' . $p->quoteIdentifierChain(array('tc','constraint_name'))
- . ' = ' . $p->quoteIdentifierChain(array('rc','constraint_name'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema','key_column_usage')) . ' kcu2'
- . ' ON ' . $p->quoteIdentifierChain(array('rc','unique_constraint_schema'))
- . ' = ' . $p->quoteIdentifierChain(array('kcu2','constraint_schema'))
- . ' AND ' . $p->quoteIdentifierChain(array('rc','unique_constraint_name'))
- . ' = ' . $p->quoteIdentifierChain(array('kcu2','constraint_name'))
- . ' AND ' . $p->quoteIdentifierChain(array('kcu','position_in_unique_constraint'))
- . ' = ' . $p->quoteIdentifierChain(array('kcu2','ordinal_position'))
-
- . ' WHERE ' . $p->quoteIdentifierChain(array('t','table_name'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('information_schema', 'tables')) . ' t'
+
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('information_schema', 'table_constraints')) . ' tc'
+ . ' ON ' . $p->quoteIdentifierChain(array('t', 'table_schema'))
+ . ' = ' . $p->quoteIdentifierChain(array('tc', 'table_schema'))
+ . ' AND ' . $p->quoteIdentifierChain(array('t', 'table_name'))
+ . ' = ' . $p->quoteIdentifierChain(array('tc', 'table_name'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema', 'key_column_usage')) . ' kcu'
+ . ' ON ' . $p->quoteIdentifierChain(array('tc', 'table_schema'))
+ . ' = ' . $p->quoteIdentifierChain(array('kcu', 'table_schema'))
+ . ' AND ' . $p->quoteIdentifierChain(array('tc', 'table_name'))
+ . ' = ' . $p->quoteIdentifierChain(array('kcu', 'table_name'))
+ . ' AND ' . $p->quoteIdentifierChain(array('tc', 'constraint_name'))
+ . ' = ' . $p->quoteIdentifierChain(array('kcu', 'constraint_name'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema', 'check_constraints')) . ' cc'
+ . ' ON ' . $p->quoteIdentifierChain(array('tc', 'constraint_schema'))
+ . ' = ' . $p->quoteIdentifierChain(array('cc', 'constraint_schema'))
+ . ' AND ' . $p->quoteIdentifierChain(array('tc', 'constraint_name'))
+ . ' = ' . $p->quoteIdentifierChain(array('cc', 'constraint_name'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema', 'referential_constraints')) . ' rc'
+ . ' ON ' . $p->quoteIdentifierChain(array('tc', 'constraint_schema'))
+ . ' = ' . $p->quoteIdentifierChain(array('rc', 'constraint_schema'))
+ . ' AND ' . $p->quoteIdentifierChain(array('tc', 'constraint_name'))
+ . ' = ' . $p->quoteIdentifierChain(array('rc', 'constraint_name'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('information_schema', 'key_column_usage')) . ' kcu2'
+ . ' ON ' . $p->quoteIdentifierChain(array('rc', 'unique_constraint_schema'))
+ . ' = ' . $p->quoteIdentifierChain(array('kcu2', 'constraint_schema'))
+ . ' AND ' . $p->quoteIdentifierChain(array('rc', 'unique_constraint_name'))
+ . ' = ' . $p->quoteIdentifierChain(array('kcu2', 'constraint_name'))
+ . ' AND ' . $p->quoteIdentifierChain(array('kcu', 'position_in_unique_constraint'))
+ . ' = ' . $p->quoteIdentifierChain(array('kcu2', 'ordinal_position'))
+
+ . ' WHERE ' . $p->quoteIdentifierChain(array('t', 'table_name'))
. ' = ' . $p->quoteTrustedValue($table)
- . ' AND ' . $p->quoteIdentifierChain(array('t','table_type'))
+ . ' AND ' . $p->quoteIdentifierChain(array('t', 'table_type'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('t', 'table_schema'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('t', 'table_schema'))
. ' != \'information_schema\'';
}
- $sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('tc','constraint_type'))
+ $sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('tc', 'constraint_type'))
. " WHEN 'PRIMARY KEY' THEN 1"
. " WHEN 'UNIQUE' THEN 2"
. " WHEN 'FOREIGN KEY' THEN 3"
. " WHEN 'CHECK' THEN 4"
. " ELSE 5 END"
- . ', ' . $p->quoteIdentifierChain(array('tc','constraint_name'))
- . ', ' . $p->quoteIdentifierChain(array('kcu','ordinal_position'));
+ . ', ' . $p->quoteIdentifierChain(array('tc', 'constraint_name'))
+ . ', ' . $p->quoteIdentifierChain(array('kcu', 'ordinal_position'));
$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
@@ -317,7 +317,7 @@ class PostgresqlMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('information_schema','triggers'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('information_schema', 'triggers'))
. ' WHERE ';
if ($schema != self::DEFAULT_SCHEMA) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
index c890d8f9db51dea396e3afa0eea59c4e71fd658f..186ef94486fb58840b94ad90f6aa64b13fa1f9cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
@@ -49,11 +49,11 @@ class SqlServerMetadata extends AbstractSource
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('T','TABLE_NAME'),
- array('T','TABLE_TYPE'),
- array('V','VIEW_DEFINITION'),
- array('V','CHECK_OPTION'),
- array('V','IS_UPDATABLE'),
+ array('T', 'TABLE_NAME'),
+ array('T', 'TABLE_TYPE'),
+ array('V', 'VIEW_DEFINITION'),
+ array('V', 'CHECK_OPTION'),
+ array('V', 'IS_UPDATABLE'),
);
array_walk($isColumns, function (&$c) use ($p) { $c = $p->quoteIdentifierChain($c); });
@@ -62,19 +62,19 @@ class SqlServerMetadata extends AbstractSource
. ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . ' t'
. ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'VIEWS')) . ' v'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('V','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('V','TABLE_NAME'))
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('V', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('V', 'TABLE_NAME'))
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
@@ -102,36 +102,36 @@ class SqlServerMetadata extends AbstractSource
$p = $this->adapter->getPlatform();
$isColumns = array(
- array('C','ORDINAL_POSITION'),
- array('C','COLUMN_DEFAULT'),
- array('C','IS_NULLABLE'),
- array('C','DATA_TYPE'),
- array('C','CHARACTER_MAXIMUM_LENGTH'),
- array('C','CHARACTER_OCTET_LENGTH'),
- array('C','NUMERIC_PRECISION'),
- array('C','NUMERIC_SCALE'),
- array('C','COLUMN_NAME'),
+ array('C', 'ORDINAL_POSITION'),
+ array('C', 'COLUMN_DEFAULT'),
+ array('C', 'IS_NULLABLE'),
+ array('C', 'DATA_TYPE'),
+ array('C', 'CHARACTER_MAXIMUM_LENGTH'),
+ array('C', 'CHARACTER_OCTET_LENGTH'),
+ array('C', 'NUMERIC_PRECISION'),
+ array('C', 'NUMERIC_SCALE'),
+ array('C', 'COLUMN_NAME'),
);
array_walk($isColumns, function (&$c) use ($p) { $c = $p->quoteIdentifierChain($c); });
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . 'T'
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','COLUMNS')) . 'C'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('C','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('C','TABLE_NAME'))
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . 'T'
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'COLUMNS')) . 'C'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('C', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('C', 'TABLE_NAME'))
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')'
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
. ' = ' . $p->quoteTrustedValue($table);
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
@@ -164,17 +164,17 @@ class SqlServerMetadata extends AbstractSource
$this->prepareDataHierarchy('constraints', $schema, $table);
$isColumns = array(
- array('T','TABLE_NAME'),
- array('TC','CONSTRAINT_NAME'),
- array('TC','CONSTRAINT_TYPE'),
- array('KCU','COLUMN_NAME'),
- array('CC','CHECK_CLAUSE'),
- array('RC','MATCH_OPTION'),
- array('RC','UPDATE_RULE'),
- array('RC','DELETE_RULE'),
- array('REFERENCED_TABLE_SCHEMA' => 'KCU2','TABLE_SCHEMA'),
- array('REFERENCED_TABLE_NAME' => 'KCU2','TABLE_NAME'),
- array('REFERENCED_COLUMN_NAME' => 'KCU2','COLUMN_NAME'),
+ array('T', 'TABLE_NAME'),
+ array('TC', 'CONSTRAINT_NAME'),
+ array('TC', 'CONSTRAINT_TYPE'),
+ array('KCU', 'COLUMN_NAME'),
+ array('CC', 'CHECK_CLAUSE'),
+ array('RC', 'MATCH_OPTION'),
+ array('RC', 'UPDATE_RULE'),
+ array('RC', 'DELETE_RULE'),
+ array('REFERENCED_TABLE_SCHEMA' => 'KCU2', 'TABLE_SCHEMA'),
+ array('REFERENCED_TABLE_NAME' => 'KCU2', 'TABLE_NAME'),
+ array('REFERENCED_COLUMN_NAME' => 'KCU2', 'COLUMN_NAME'),
);
$p = $this->adapter->getPlatform();
@@ -188,63 +188,63 @@ class SqlServerMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLES')) . ' T'
-
- . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TABLE_CONSTRAINTS')) . ' TC'
- . ' ON ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('TC','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('TC','TABLE_NAME'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','KEY_COLUMN_USAGE')) . ' KCU'
- . ' ON ' . $p->quoteIdentifierChain(array('TC','TABLE_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('TC','TABLE_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_NAME'))
- . ' AND ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU','CONSTRAINT_NAME'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','CHECK_CONSTRAINTS')) . ' CC'
- . ' ON ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('CC','CONSTRAINT_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('CC','CONSTRAINT_NAME'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','REFERENTIAL_CONSTRAINTS')) . ' RC'
- . ' ON ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_NAME'))
-
- . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','KEY_COLUMN_USAGE')) . ' KCU2'
- . ' ON ' . $p->quoteIdentifierChain(array('RC','UNIQUE_CONSTRAINT_SCHEMA'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU2','CONSTRAINT_SCHEMA'))
- . ' AND ' . $p->quoteIdentifierChain(array('RC','UNIQUE_CONSTRAINT_NAME'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU2','CONSTRAINT_NAME'))
- . ' AND ' . $p->quoteIdentifierChain(array('KCU','ORDINAL_POSITION'))
- . ' = ' . $p->quoteIdentifierChain(array('KCU2','ORDINAL_POSITION'))
-
- . ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLES')) . ' T'
+
+ . ' INNER JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TABLE_CONSTRAINTS')) . ' TC'
+ . ' ON ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('TC', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('TC', 'TABLE_NAME'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'KEY_COLUMN_USAGE')) . ' KCU'
+ . ' ON ' . $p->quoteIdentifierChain(array('TC', 'TABLE_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('TC', 'TABLE_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'TABLE_NAME'))
+ . ' AND ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU', 'CONSTRAINT_NAME'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'CHECK_CONSTRAINTS')) . ' CC'
+ . ' ON ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('CC', 'CONSTRAINT_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('CC', 'CONSTRAINT_NAME'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'REFERENTIAL_CONSTRAINTS')) . ' RC'
+ . ' ON ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('RC', 'CONSTRAINT_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('RC', 'CONSTRAINT_NAME'))
+
+ . ' LEFT JOIN ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'KEY_COLUMN_USAGE')) . ' KCU2'
+ . ' ON ' . $p->quoteIdentifierChain(array('RC', 'UNIQUE_CONSTRAINT_SCHEMA'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU2', 'CONSTRAINT_SCHEMA'))
+ . ' AND ' . $p->quoteIdentifierChain(array('RC', 'UNIQUE_CONSTRAINT_NAME'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU2', 'CONSTRAINT_NAME'))
+ . ' AND ' . $p->quoteIdentifierChain(array('KCU', 'ORDINAL_POSITION'))
+ . ' = ' . $p->quoteIdentifierChain(array('KCU2', 'ORDINAL_POSITION'))
+
+ . ' WHERE ' . $p->quoteIdentifierChain(array('T', 'TABLE_NAME'))
. ' = ' . $p->quoteTrustedValue($table)
- . ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
+ . ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_TYPE'))
. ' IN (\'BASE TABLE\', \'VIEW\')';
if ($schema != self::DEFAULT_SCHEMA) {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' = ' . $p->quoteTrustedValue($schema);
} else {
- $sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
+ $sql .= ' AND ' . $p->quoteIdentifierChain(array('T', 'TABLE_SCHEMA'))
. ' != \'INFORMATION_SCHEMA\'';
}
- $sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_TYPE'))
+ $sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_TYPE'))
. " WHEN 'PRIMARY KEY' THEN 1"
. " WHEN 'UNIQUE' THEN 2"
. " WHEN 'FOREIGN KEY' THEN 3"
. " WHEN 'CHECK' THEN 4"
. " ELSE 5 END"
- . ', ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_NAME'))
- . ', ' . $p->quoteIdentifierChain(array('KCU','ORDINAL_POSITION'));
+ . ', ' . $p->quoteIdentifierChain(array('TC', 'CONSTRAINT_NAME'))
+ . ', ' . $p->quoteIdentifierChain(array('KCU', 'ORDINAL_POSITION'));
$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
@@ -316,7 +316,7 @@ class SqlServerMetadata extends AbstractSource
});
$sql = 'SELECT ' . implode(', ', $isColumns)
- . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA','TRIGGERS'))
+ . ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'TRIGGERS'))
. ' WHERE ';
if ($schema != self::DEFAULT_SCHEMA) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php
index aa7e5e0d5100e4b80feb3a59669280b46c7e13ec..46ef4f8b31b29bf16cb5c748687e77bf4113c833 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php
@@ -267,7 +267,7 @@ class SqliteMetadata extends AbstractSource
'CREATE',
array('TEMP|TEMPORARY'),
'VIEW',
- array('IF','NOT','EXISTS'),
+ array('IF', 'NOT', 'EXISTS'),
$identifierChain,
'AS',
'(?<view_definition>.+)',
@@ -294,15 +294,15 @@ class SqliteMetadata extends AbstractSource
'CREATE',
array('TEMP|TEMPORARY'),
'TRIGGER',
- array('IF','NOT','EXISTS'),
+ array('IF', 'NOT', 'EXISTS'),
$identifierChain,
array('(?<action_timing>BEFORE|AFTER|INSTEAD\\s+OF)',),
'(?<event_manipulation>DELETE|INSERT|UPDATE)',
- array('OF','(?<column_usage>' . $identifierList . ')'),
+ array('OF', '(?<column_usage>' . $identifierList . ')'),
'ON',
'(?<event_object_table>' . $identifier . ')',
- array('FOR','EACH','ROW'),
- array('WHEN','(?<action_condition>.+)'),
+ array('FOR', 'EACH', 'ROW'),
+ array('WHEN', '(?<action_condition>.+)'),
'(?<action_statement>BEGIN',
'.+',
'END)',
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
index 6580ed179917d83a2958e1e9cc88d586c70c1223..2e783738eb6f3b9231c30f390b9091a1f3de9922 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
@@ -18,7 +18,6 @@ use Zend\Db\Adapter\Driver\ResultInterface;
abstract class AbstractResultSet implements Iterator, ResultSetInterface
{
-
/**
* if -1, datasource is already buffered
* if -2, implicitly disabling buffering in ResultSet
@@ -58,6 +57,11 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
*/
public function initialize($dataSource)
{
+ // reset buffering
+ if (is_array($this->buffer)) {
+ $this->buffer = array();
+ }
+
if ($dataSource instanceof ResultInterface) {
$this->count = $dataSource->count();
$this->fieldCount = $dataSource->getFieldCount();
@@ -65,6 +69,9 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
if ($dataSource->isBuffered()) {
$this->buffer = -1;
}
+ if (is_array($this->buffer)) {
+ $this->dataSource->rewind();
+ }
return $this;
}
@@ -97,6 +104,9 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
throw new Exception\RuntimeException('Buffering must be enabled before iteration is started');
} elseif ($this->buffer === null) {
$this->buffer = array();
+ if ($this->dataSource instanceof ResultInterface) {
+ $this->dataSource->rewind();
+ }
}
return $this;
}
@@ -211,7 +221,6 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
$key = key($this->dataSource);
return ($key !== null);
}
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php
index c25824f7720f484f3cdd66fd87b7896786fe1919..ffb816e0dbd22f3d622d3011cfc135295bdbd065 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php
@@ -120,7 +120,7 @@ abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayI
/**
* Save
*
- * @return integer
+ * @return int
*/
public function save()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
index b8f2dc1810771881db93fae9f97b6bee45ba7dfb..5153e26b96c7dd3b2bd1c8ac24452357c72b0647 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
@@ -10,9 +10,9 @@
namespace Zend\Db\Sql;
use Zend\Db\Adapter\Driver\DriverInterface;
-use Zend\Db\Adapter\StatementContainer;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\StatementContainer;
abstract class AbstractSql
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php
new file mode 100644
index 0000000000000000000000000000000000000000..60fb4b08217d31bb387cf42db335b7637d73e912
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl;
+
+use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\Platform\Sql92 as AdapterSql92Platform;
+use Zend\Db\Sql\AbstractSql;
+
+class AlterTable extends AbstractSql implements SqlInterface
+{
+ const ADD_COLUMNS = 'addColumns';
+ const ADD_CONSTRAINTS = 'addConstraints';
+ const CHANGE_COLUMNS = 'changeColumns';
+ const DROP_COLUMNS = 'dropColumns';
+ const DROP_CONSTRAINTS = 'dropConstraints';
+ const TABLE = 'table';
+
+ /**
+ * @var array
+ */
+ protected $addColumns = array();
+
+ /**
+ * @var array
+ */
+ protected $addConstraints = array();
+
+ /**
+ * @var array
+ */
+ protected $changeColumns = array();
+
+ /**
+ * @var array
+ */
+ protected $dropColumns = array();
+
+ /**
+ * @var array
+ */
+ protected $dropConstraints = array();
+
+ /**
+ * Specifications for Sql String generation
+ * @var array
+ */
+ protected $specifications = array(
+ self::TABLE => "ALTER TABLE %1\$s\n",
+ self::ADD_COLUMNS => array(
+ "%1\$s" => array(
+ array(1 => 'ADD COLUMN %1$s', 'combinedby' => ",\n")
+ )
+ ),
+ self::CHANGE_COLUMNS => array(
+ "%1\$s" => array(
+ array(2 => 'CHANGE COLUMN %1$s %2$s', 'combinedby' => ",\n"),
+ )
+ ),
+ self::DROP_COLUMNS => array(
+ "%1\$s" => array(
+ array(1 => 'DROP COLUMN %1$s', 'combinedby' => ",\n"),
+ )
+ ),
+ self::ADD_CONSTRAINTS => array(
+ "%1\$s" => array(
+ array(1 => 'ADD %1$s', 'combinedby' => ",\n"),
+ )
+ ),
+ self::DROP_CONSTRAINTS => array(
+ "%1\$s" => array(
+ array(1 => 'DROP CONSTRAINT %1$s', 'combinedby' => ",\n"),
+ )
+ )
+ );
+
+ /**
+ * @var string
+ */
+ protected $table = '';
+
+ /**
+ * @param string $table
+ */
+ public function __construct($table = '')
+ {
+ ($table) ? $this->setTable($table) : null;
+ }
+
+ /**
+ * @param string $name
+ * @return self
+ */
+ public function setTable($name)
+ {
+ $this->table = $name;
+
+ return $this;
+ }
+
+ /**
+ * @param Column\ColumnInterface $column
+ * @return self
+ */
+ public function addColumn(Column\ColumnInterface $column)
+ {
+ $this->addColumns[] = $column;
+
+ return $this;
+ }
+
+ /**
+ * @param string $name
+ * @param Column\ColumnInterface $column
+ * @return self
+ */
+ public function changeColumn($name, Column\ColumnInterface $column)
+ {
+ $this->changeColumns[$name] = $column;
+
+ return $this;
+ }
+
+ /**
+ * @param string $name
+ * @return self
+ */
+ public function dropColumn($name)
+ {
+ $this->dropColumns[] = $name;
+
+ return $this;
+ }
+
+ /**
+ * @param string $name
+ * @return self
+ */
+ public function dropConstraint($name)
+ {
+ $this->dropConstraints[] = $name;
+
+ return $this;
+ }
+
+ /**
+ * @param Constraint\ConstraintInterface $constraint
+ * @return self
+ */
+ public function addConstraint(Constraint\ConstraintInterface $constraint)
+ {
+ $this->addConstraints[] = $constraint;
+
+ return $this;
+ }
+
+ /**
+ * @param string|null $key
+ * @return array
+ */
+ public function getRawState($key = null)
+ {
+ $rawState = array(
+ self::TABLE => $this->table,
+ self::ADD_COLUMNS => $this->addColumns,
+ self::DROP_COLUMNS => $this->dropColumns,
+ self::CHANGE_COLUMNS => $this->changeColumns,
+ self::ADD_CONSTRAINTS => $this->addConstraints,
+ self::DROP_CONSTRAINTS => $this->dropConstraints,
+ );
+
+ return (isset($key) && array_key_exists($key, $rawState)) ? $rawState[$key] : $rawState;
+ }
+
+ /**
+ * @param PlatformInterface $adapterPlatform
+ * @return string
+ */
+ public function getSqlString(PlatformInterface $adapterPlatform = null)
+ {
+ // get platform, or create default
+ $adapterPlatform = ($adapterPlatform) ?: new AdapterSql92Platform;
+
+ $sqls = array();
+ $parameters = array();
+
+ foreach ($this->specifications as $name => $specification) {
+ $parameters[$name] = $this->{'process' . $name}($adapterPlatform, null, null, $sqls, $parameters);
+ if ($specification && is_array($parameters[$name]) && ($parameters[$name] != array(array()))) {
+ $sqls[$name] = $this->createSqlFromSpecificationAndParameters($specification, $parameters[$name]);
+ }
+ if (stripos($name, 'table') === false && $parameters[$name] !== array(array())) {
+ $sqls[] = ",\n";
+ }
+ }
+
+ // remove last ,\n
+ array_pop($sqls);
+
+ $sql = implode('', $sqls);
+
+ return $sql;
+ }
+
+ protected function processTable(PlatformInterface $adapterPlatform = null)
+ {
+ return array($adapterPlatform->quoteIdentifier($this->table));
+ }
+
+ protected function processAddColumns(PlatformInterface $adapterPlatform = null)
+ {
+ $sqls = array();
+ foreach ($this->addColumns as $column) {
+ $sqls[] = $this->processExpression($column, $adapterPlatform)->getSql();
+ }
+
+ return array($sqls);
+ }
+
+ protected function processChangeColumns(PlatformInterface $adapterPlatform = null)
+ {
+ $sqls = array();
+ foreach ($this->changeColumns as $name => $column) {
+ $sqls[] = array(
+ $adapterPlatform->quoteIdentifier($name),
+ $this->processExpression($column, $adapterPlatform)->getSql()
+ );
+ }
+
+ return array($sqls);
+ }
+
+ protected function processDropColumns(PlatformInterface $adapterPlatform = null)
+ {
+ $sqls = array();
+ foreach ($this->dropColumns as $column) {
+ $sqls[] = $adapterPlatform->quoteIdentifier($column);
+ }
+
+ return array($sqls);
+ }
+
+ protected function processAddConstraints(PlatformInterface $adapterPlatform = null)
+ {
+ $sqls = array();
+ foreach ($this->addConstraints as $constraint) {
+ $sqls[] = $this->processExpression($constraint, $adapterPlatform);
+ }
+
+ return array($sqls);
+ }
+
+ protected function processDropConstraints(PlatformInterface $adapterPlatform = null)
+ {
+ $sqls = array();
+ foreach ($this->dropConstraints as $constraint) {
+ $sqls[] = $adapterPlatform->quoteIdentifier($constraint);
+ }
+
+ return array($sqls);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Blob.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Blob.php
new file mode 100644
index 0000000000000000000000000000000000000000..db879b5c08201d297a48c685acf5efb720ad6569
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Blob.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Blob extends Column
+{
+ /**
+ * @var int
+ */
+ protected $length;
+
+ /**
+ * @var string Change type to blob
+ */
+ protected $type = 'BLOB';
+
+ /**
+ * @param null $name
+ * @param int $length
+ * @param bool $nullable
+ * @param null $default
+ * @param array $options
+ */
+ public function __construct($name, $length, $nullable = false, $default = null, array $options = array())
+ {
+ $this->setName($name);
+ $this->setLength($length);
+ $this->setNullable($nullable);
+ $this->setDefault($default);
+ $this->setOptions($options);
+ }
+
+ /**
+ * @param int $length
+ * @return self
+ */
+ public function setLength($length)
+ {
+ $this->length = $length;
+ return $this;
+ }
+
+ /**
+ * @return int
+ */
+ public function getLength()
+ {
+ return $this->length;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+
+ $params = array();
+ $params[] = $this->name;
+ $params[] = $this->type;
+
+ if ($this->length) {
+ $params[1] .= ' ' . $this->length;
+ }
+
+ $types = array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL);
+
+ if (!$this->isNullable) {
+ $params[1] .= ' NOT NULL';
+ }
+
+ if ($this->default !== null) {
+ $spec .= ' DEFAULT %s';
+ $params[] = $this->default;
+ $types[] = self::TYPE_VALUE;
+ }
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php
new file mode 100644
index 0000000000000000000000000000000000000000..d6255e53d2ce8f7b3ae4f32d241045fe26ee6e7e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Boolean extends Column
+{
+ /**
+ * @var string specification
+ */
+ protected $specification = '%s TINYINT NOT NULL';
+
+ /**
+ * @param string $name
+ */
+ public function __construct($name)
+ {
+ $this->name = $name;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array($this->name);
+ $types = array(self::TYPE_IDENTIFIER);
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Char.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Char.php
new file mode 100644
index 0000000000000000000000000000000000000000..3f1315a5eb7f297545f7a6cd4e04acdaddb2a93b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Char.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Char extends Column
+{
+ /**
+ * @var string
+ */
+ protected $specification = '%s CHAR(%s) %s %s';
+
+ /**
+ * @var int
+ */
+ protected $length;
+
+ /**
+ * @param string $name
+ * @param int $length
+ */
+ public function __construct($name, $length)
+ {
+ $this->name = $name;
+ $this->length = $length;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array();
+
+ $types = array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL);
+ $params[] = $this->name;
+ $params[] = $this->length;
+
+ $types[] = self::TYPE_LITERAL;
+ $params[] = (!$this->isNullable) ? 'NOT NULL' : '';
+
+ $types[] = ($this->default !== null) ? self::TYPE_VALUE : self::TYPE_LITERAL;
+ $params[] = ($this->default !== null) ? $this->default : '';
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Column.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Column.php
new file mode 100644
index 0000000000000000000000000000000000000000..1451275b587b380ee8a99f3ca8fd986e2330a085
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Column.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Column implements ColumnInterface
+{
+ /**
+ * @var null|string|int
+ */
+ protected $default = null;
+
+ /**
+ * @var bool
+ */
+ protected $isNullable = false;
+
+ /**
+ * @var string
+ */
+ protected $name = null;
+
+ /**
+ * @var array
+ */
+ protected $options = array();
+
+ /**
+ * @var string
+ */
+ protected $specification = '%s %s';
+
+ /**
+ * @var string
+ */
+ protected $type = 'INTEGER';
+
+ /**
+ * @param null|string $name
+ */
+ public function __construct($name = null)
+ {
+ (!$name) ?: $this->setName($name);
+ }
+
+ /**
+ * @param string $name
+ * @return self
+ */
+ public function setName($name)
+ {
+ $this->name = $name;
+ return $this;
+ }
+
+ /**
+ * @return null|string
+ */
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * @param bool $nullable
+ * @return self
+ */
+ public function setNullable($nullable)
+ {
+ $this->isNullable = (bool) $nullable;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isNullable()
+ {
+ return $this->isNullable;
+ }
+
+ /**
+ * @param null|string|int $default
+ * @return self
+ */
+ public function setDefault($default)
+ {
+ $this->default = $default;
+ return $this;
+ }
+
+ /**
+ * @return null|string|int
+ */
+ public function getDefault()
+ {
+ return $this->default;
+ }
+
+ /**
+ * @param array $options
+ * @return self
+ */
+ public function setOptions(array $options)
+ {
+ $this->options = $options;
+ return $this;
+ }
+
+ /**
+ * @param string $name
+ * @param string $value
+ * @return self
+ */
+ public function setOption($name, $value)
+ {
+ $this->options[$name] = $value;
+ return $this;
+ }
+
+ /**
+ * @return array
+ */
+ public function getOptions()
+ {
+ return $this->options;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+
+ $params = array();
+ $params[] = $this->name;
+ $params[] = $this->type;
+
+ $types = array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL);
+
+ if (!$this->isNullable) {
+ $params[1] .= ' NOT NULL';
+ }
+
+ if ($this->default !== null) {
+ $spec .= ' DEFAULT %s';
+ $params[] = $this->default;
+ $types[] = self::TYPE_VALUE;
+ }
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ea33e666a8cb87f889f9bd89cb52e5f2c033d39
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+use Zend\Db\Sql\ExpressionInterface;
+
+interface ColumnInterface extends ExpressionInterface
+{
+ public function getName();
+ public function isNullable();
+ public function getDefault();
+ public function getOptions();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php
new file mode 100644
index 0000000000000000000000000000000000000000..930b89a3a5a5adcff38e982fb1e814928a83dc47
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Date extends Column
+{
+ /**
+ * @var string
+ */
+ protected $specification = '%s DATE %s %s';
+
+ /**
+ * @param string $name
+ */
+ public function __construct($name)
+ {
+ $this->name = $name;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array();
+
+ $types = array(self::TYPE_IDENTIFIER);
+ $params[] = $this->name;
+
+ $types[] = self::TYPE_LITERAL;
+ $params[] = (!$this->isNullable) ? 'NOT NULL' : '';
+
+ $types[] = ($this->default !== null) ? self::TYPE_VALUE : self::TYPE_LITERAL;
+ $params[] = ($this->default !== null) ? $this->default : '';
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Decimal.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Decimal.php
new file mode 100644
index 0000000000000000000000000000000000000000..1983099ac2de5d9cd3bf7469cc682793a3353038
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Decimal.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Decimal extends Column
+{
+ /**
+ * @var int
+ */
+ protected $precision;
+
+ /**
+ * @var int
+ */
+ protected $scale;
+
+ /**
+ * @var string
+ */
+ protected $specification = '%s DECIMAL(%s) %s %s';
+
+ /**
+ * @param null|string $name
+ * @param int $precision
+ * @param null|int $scale
+ */
+ public function __construct($name, $precision, $scale = null)
+ {
+ $this->name = $name;
+ $this->precision = $precision;
+ $this->scale = $scale;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array();
+
+ $types = array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL);
+ $params[] = $this->name;
+ $params[] = $this->precision;
+
+ if ($this->scale !== null) {
+ $params[1] .= ', ' . $this->scale;
+ }
+
+ $types[] = self::TYPE_LITERAL;
+ $params[] = (!$this->isNullable) ? 'NOT NULL' : '';
+
+ $types[] = ($this->default !== null) ? self::TYPE_VALUE : self::TYPE_LITERAL;
+ $params[] = ($this->default !== null) ? $this->default : '';
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Float.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Float.php
new file mode 100644
index 0000000000000000000000000000000000000000..6fe3751bb98269794a13a9d65d0bb81ae65c7a4d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Float.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Float extends Column
+{
+ /**
+ * @var int
+ */
+ protected $decimal;
+
+ /**
+ * @var int
+ */
+ protected $digits;
+
+ /**
+ * @var string
+ */
+ protected $specification = '%s DECIMAL(%s) %s %s';
+
+ /**
+ * @param null|string $name
+ * @param int $digits
+ * @param int $decimal
+ */
+ public function __construct($name, $digits, $decimal)
+ {
+ $this->name = $name;
+ $this->digits = $digits;
+ $this->decimal = $decimal;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array();
+
+ $types = array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL);
+ $params[] = $this->name;
+ $params[] = $this->digits;
+ $params[1] .= ', ' . $this->decimal;
+
+ $types[] = self::TYPE_LITERAL;
+ $params[] = (!$this->isNullable) ? 'NOT NULL' : '';
+
+ $types[] = ($this->default !== null) ? self::TYPE_VALUE : self::TYPE_LITERAL;
+ $params[] = ($this->default !== null) ? $this->default : '';
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Integer.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Integer.php
new file mode 100644
index 0000000000000000000000000000000000000000..670a72767206f99eb564ae5913cef3f59a980f65
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Integer.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Integer extends Column
+{
+ /**
+ * @var int
+ */
+ protected $length;
+
+ /**
+ * @param null|string $name
+ * @param bool $nullable
+ * @param null|string|int $default
+ * @param array $options
+ */
+ public function __construct($name, $nullable = false, $default = null, array $options = array())
+ {
+ $this->setName($name);
+ $this->setNullable($nullable);
+ $this->setDefault($default);
+ $this->setOptions($options);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Time.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Time.php
new file mode 100644
index 0000000000000000000000000000000000000000..60c11ad554aa9d8215c07e591d30a4d2950ea3c7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Time.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Time extends Column
+{
+ /**
+ * @var string
+ */
+ protected $specification = '%s TIME %s %s';
+
+ /**
+ * @param string $name
+ */
+ public function __construct($name)
+ {
+ $this->name = $name;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array();
+
+ $types = array(self::TYPE_IDENTIFIER);
+ $params[] = $this->name;
+
+ $types[] = self::TYPE_LITERAL;
+ $params[] = (!$this->isNullable) ? 'NOT NULL' : '';
+
+ $types[] = ($this->default !== null) ? self::TYPE_VALUE : self::TYPE_LITERAL;
+ $params[] = ($this->default !== null) ? $this->default : '';
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Varchar.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Varchar.php
new file mode 100644
index 0000000000000000000000000000000000000000..7da9a362df0b25d58877a713495be93c8ebb2d3d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Varchar.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class Varchar extends Column
+{
+ /**
+ * @var int
+ */
+ protected $length;
+
+ /**
+ * @var string
+ */
+ protected $specification = '%s VARCHAR(%s) %s %s';
+
+ /**
+ * @param null|string $name
+ * @param int $length
+ */
+ public function __construct($name, $length)
+ {
+ $this->name = $name;
+ $this->length = $length;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array();
+
+ $types = array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL);
+ $params[] = $this->name;
+ $params[] = $this->length;
+
+ $types[] = self::TYPE_LITERAL;
+ $params[] = (!$this->isNullable) ? 'NOT NULL' : '';
+
+ $types[] = ($this->default !== null) ? self::TYPE_VALUE : self::TYPE_LITERAL;
+ $params[] = ($this->default !== null) ? $this->default : '';
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
new file mode 100644
index 0000000000000000000000000000000000000000..9212d805417a3f4960dc2c706633d6803f605b83
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Constraint;
+
+abstract class AbstractConstraint implements ConstraintInterface
+{
+ /**
+ * @var array
+ */
+ protected $columns = array();
+
+ /**
+ * @param null|string|array $columns
+ */
+ public function __construct($columns = null)
+ {
+ (!$columns) ?: $this->setColumns($columns);
+ }
+
+ /**
+ * @param null|string|array $columns
+ * @return self
+ */
+ public function setColumns($columns)
+ {
+ if (!is_array($columns)) {
+ $columns = array($columns);
+ }
+
+ $this->columns = $columns;
+ return $this;
+ }
+
+ /**
+ * @param string $column
+ * @return self
+ */
+ public function addColumn($column)
+ {
+ $this->columns[] = $column;
+ return $this;
+ }
+
+ /**
+ * @return array
+ */
+ public function getColumns()
+ {
+ return $this->columns;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/Check.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/Check.php
new file mode 100644
index 0000000000000000000000000000000000000000..c0fa1ff71ef619ae57967f78337390384317778e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/Check.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Constraint;
+
+class Check extends AbstractConstraint
+{
+ /**
+ * @var string|\Zend\Db\Sql\ExpressionInterface
+ */
+ protected $expression;
+
+ /**
+ * @var string
+ */
+ protected $specification = 'CONSTRAINT %s CHECK (%s)';
+
+ /**
+ * @param string|\Zend\Db\Sql\ExpressionInterface $expression
+ * @param null|string $name
+ */
+ public function __construct($expression, $name)
+ {
+ $this->expression = $expression;
+ $this->name = $name;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ return array(array(
+ $this->specification,
+ array($this->name, $this->expression),
+ array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL),
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..73fd27682ae33a61383911ea8e3e86aad0935beb
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Constraint;
+
+use Zend\Db\Sql\ExpressionInterface;
+
+interface ConstraintInterface extends ExpressionInterface
+{
+ public function getColumns();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
new file mode 100644
index 0000000000000000000000000000000000000000..c29df551f48803a0c6cd5e393c95623632b4dbb3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Constraint;
+
+class ForeignKey extends AbstractConstraint
+{
+ /**
+ * @var string
+ */
+ protected $name;
+
+ /**
+ * @var string
+ */
+ protected $onDeleteRule = 'NO ACTION';
+
+ /**
+ * @var string
+ */
+ protected $onUpdateRule = 'NO ACTION';
+
+ /**
+ * @var string
+ */
+ protected $referenceColumn;
+
+ /**
+ * @var string
+ */
+ protected $referenceTable;
+
+ /**
+ * @var string
+ */
+ protected $specification = 'CONSTRAINT %1$s FOREIGN KEY (%2$s) REFERENCES %3$s (%4$s) ON DELETE %5$s ON UPDATE %6$s';
+
+ /**
+ * @param array|null|string $name
+ * @param string $column
+ * @param string $referenceTable
+ * @param string $referenceColumn
+ * @param null|string $onDeleteRule
+ * @param null|string $onUpdateRule
+ */
+ public function __construct($name, $column, $referenceTable, $referenceColumn, $onDeleteRule = null, $onUpdateRule = null)
+ {
+ $this->setName($name);
+ $this->setColumns($column);
+ $this->setReferenceTable($referenceTable);
+ $this->setReferenceColumn($referenceColumn);
+ (!$onDeleteRule) ?: $this->setOnDeleteRule($onDeleteRule);
+ (!$onUpdateRule) ?: $this->setOnUpdateRule($onUpdateRule);
+ }
+
+ /**
+ * @param string $name
+ * @return self
+ */
+ public function setName($name)
+ {
+ $this->name = $name;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * @param string $referenceTable
+ * @return self
+ */
+ public function setReferenceTable($referenceTable)
+ {
+ $this->referenceTable = $referenceTable;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getReferenceTable()
+ {
+ return $this->referenceTable;
+ }
+
+ /**
+ * @param string $referenceColumn
+ * @return self
+ */
+ public function setReferenceColumn($referenceColumn)
+ {
+ $this->referenceColumn = $referenceColumn;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getReferenceColumn()
+ {
+ return $this->referenceColumn;
+ }
+
+ /**
+ * @param string $onDeleteRule
+ * @return self
+ */
+ public function setOnDeleteRule($onDeleteRule)
+ {
+ $this->onDeleteRule = $onDeleteRule;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOnDeleteRule()
+ {
+ return $this->onDeleteRule;
+ }
+
+ /**
+ * @param string $onUpdateRule
+ * @return self
+ */
+ public function setOnUpdateRule($onUpdateRule)
+ {
+ $this->onUpdateRule = $onUpdateRule;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOnUpdateRule()
+ {
+ return $this->onUpdateRule;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ return array(array(
+ $this->specification,
+ array(
+ $this->name,
+ $this->columns[0],
+ $this->referenceTable,
+ $this->referenceColumn,
+ $this->onDeleteRule,
+ $this->onUpdateRule,
+ ),
+ array(
+ self::TYPE_IDENTIFIER,
+ self::TYPE_IDENTIFIER,
+ self::TYPE_IDENTIFIER,
+ self::TYPE_IDENTIFIER,
+ self::TYPE_LITERAL,
+ self::TYPE_LITERAL,
+ ),
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
new file mode 100644
index 0000000000000000000000000000000000000000..597c72c939112f1a03b38eccef8e5a62b07271c4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Constraint;
+
+class PrimaryKey extends AbstractConstraint
+{
+ /**
+ * @var string
+ */
+ protected $specification = 'PRIMARY KEY (%s)';
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $colCount = count($this->columns);
+ $newSpecParts = array_fill(0, $colCount, '%s');
+ $newSpecTypes = array_fill(0, $colCount, self::TYPE_IDENTIFIER);
+
+ $newSpec = sprintf($this->specification, implode(', ', $newSpecParts));
+
+ return array(array(
+ $newSpec,
+ $this->columns,
+ $newSpecTypes,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
new file mode 100644
index 0000000000000000000000000000000000000000..adb496cbe703ae57c3fbd0443ff511c89ded0fa4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Constraint;
+
+class UniqueKey extends AbstractConstraint
+{
+ /**
+ * @var string
+ */
+ protected $specification = 'CONSTRAINT UNIQUE KEY %s(...)';
+
+ /**
+ * @param string $column
+ * @param null|string $name
+ */
+ public function __construct($column, $name = null)
+ {
+ $this->setColumns($column);
+ $this->name = $name;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $colCount = count($this->columns);
+
+ $values = array();
+ $values[] = ($this->name) ? $this->name : '';
+
+ $newSpecTypes = array(self::TYPE_IDENTIFIER);
+ $newSpecParts = array();
+
+ for ($i = 0; $i < $colCount; $i++) {
+ $newSpecParts[] = '%s';
+ $newSpecTypes[] = self::TYPE_IDENTIFIER;
+ }
+
+ $newSpec = str_replace('...', implode(', ', $newSpecParts), $this->specification);
+
+ return array(array(
+ $newSpec,
+ array_merge($values, $this->columns),
+ $newSpecTypes,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc707e006f750c3035a543ef7195e34d36a57555
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl;
+
+use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\Platform\Sql92 as AdapterSql92Platform;
+use Zend\Db\Sql\AbstractSql;
+
+class CreateTable extends AbstractSql implements SqlInterface
+{
+ const COLUMNS = 'columns';
+ const CONSTRAINTS = 'constraints';
+ const TABLE = 'table';
+
+ /**
+ * @var array
+ */
+ protected $columns = array();
+
+ /**
+ * @var array
+ */
+ protected $constraints = array();
+
+ /**
+ * @var bool
+ */
+ protected $isTemporary = false;
+
+ /**
+ * Specifications for Sql String generation
+ * @var array
+ */
+ protected $specifications = array(
+ self::TABLE => 'CREATE TABLE %1$s (',
+ self::COLUMNS => array(
+ "\n %1\$s" => array(
+ array(1 => '%1$s', 'combinedby' => ",\n ")
+ )
+ ),
+ self::CONSTRAINTS => array(
+ "\n %1\$s" => array(
+ array(1 => '%1$s', 'combinedby' => ",\n ")
+ )
+ ),
+ );
+
+ /**
+ * @var string
+ */
+ protected $table = '';
+
+ /**
+ * @param string $table
+ * @param bool $isTemporary
+ */
+ public function __construct($table = '', $isTemporary = false)
+ {
+ $this->table = $table;
+ $this->setTemporary($isTemporary);
+ }
+
+ /**
+ * @param bool $temporary
+ * @return self
+ */
+ public function setTemporary($temporary)
+ {
+ $this->isTemporary = (bool) $temporary;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isTemporary()
+ {
+ return $this->isTemporary;
+ }
+
+ /**
+ * @param string $name
+ * @return self
+ */
+ public function setTable($name)
+ {
+ $this->table = $name;
+ return $this;
+ }
+
+ /**
+ * @param Column\ColumnInterface $column
+ * @return self
+ */
+ public function addColumn(Column\ColumnInterface $column)
+ {
+ $this->columns[] = $column;
+ return $this;
+ }
+
+ /**
+ * @param Constraint\ConstraintInterface $constraint
+ * @return self
+ */
+ public function addConstraint(Constraint\ConstraintInterface $constraint)
+ {
+ $this->constraints[] = $constraint;
+ return $this;
+ }
+
+ /**
+ * @param string|null $key
+ * @return array
+ */
+ public function getRawState($key = null)
+ {
+ $rawState = array(
+ self::COLUMNS => $this->columns,
+ self::CONSTRAINTS => $this->constraints,
+ self::TABLE => $this->table,
+ );
+
+ return (isset($key) && array_key_exists($key, $rawState)) ? $rawState[$key] : $rawState;
+ }
+
+ /**
+ * @param PlatformInterface $adapterPlatform
+ * @return string
+ */
+ public function getSqlString(PlatformInterface $adapterPlatform = null)
+ {
+ // get platform, or create default
+ $adapterPlatform = ($adapterPlatform) ?: new AdapterSql92Platform;
+
+ $sqls = array();
+ $parameters = array();
+
+ foreach ($this->specifications as $name => $specification) {
+ if (is_int($name)) {
+ $sqls[] = $specification;
+ continue;
+ }
+
+ $parameters[$name] = $this->{'process' . $name}(
+ $adapterPlatform,
+ null,
+ null,
+ $sqls,
+ $parameters
+ );
+
+ if ($specification
+ && is_array($parameters[$name])
+ && ($parameters[$name] != array(array()))
+ ) {
+ $sqls[$name] = $this->createSqlFromSpecificationAndParameters(
+ $specification,
+ $parameters[$name]
+ );
+ }
+
+ if (stripos($name, 'table') === false
+ && $parameters[$name] !== array(array())
+ ) {
+ $sqls[] = ",\n";
+ }
+ }
+
+ // remove last ,
+ if (count($sqls) > 2) {
+ array_pop($sqls);
+ }
+
+ $sql = implode('', $sqls) . "\n)";
+
+ return $sql;
+ }
+
+ protected function processTable(PlatformInterface $adapterPlatform = null)
+ {
+ $ret = array();
+ if ($this->isTemporary) {
+ $ret[] = 'TEMPORARY';
+ }
+ $ret[] = $adapterPlatform->quoteIdentifier($this->table);
+ return $ret;
+ }
+
+ protected function processColumns(PlatformInterface $adapterPlatform = null)
+ {
+ $sqls = array();
+ foreach ($this->columns as $column) {
+ $sqls[] = $this->processExpression($column, $adapterPlatform)->getSql();
+ }
+ return array($sqls);
+ }
+
+ protected function processConstraints(PlatformInterface $adapterPlatform = null)
+ {
+ $sqls = array();
+ foreach ($this->constraints as $constraint) {
+ $sqls[] = $this->processExpression($constraint, $adapterPlatform)->getSql();
+ }
+ return array($sqls);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/DropTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/DropTable.php
new file mode 100644
index 0000000000000000000000000000000000000000..ff7eea34603853db46b1e16af003c659861c1724
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/DropTable.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl;
+
+use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\Platform\Sql92 as AdapterSql92Platform;
+use Zend\Db\Sql\AbstractSql;
+
+class DropTable extends AbstractSql implements SqlInterface
+{
+ const TABLE = 'table';
+
+ /**
+ * @var array
+ */
+ protected $specifications = array(
+ self::TABLE => 'DROP TABLE %1$s'
+ );
+
+ /**
+ * @var string
+ */
+ protected $table = '';
+
+ /**
+ * @param string $table
+ */
+ public function __construct($table = '')
+ {
+ $this->table = $table;
+ }
+
+ /**
+ * @param null|PlatformInterface $adapterPlatform
+ * @return string
+ */
+ public function getSqlString(PlatformInterface $adapterPlatform = null)
+ {
+ // get platform, or create default
+ $adapterPlatform = ($adapterPlatform) ?: new AdapterSql92Platform;
+
+ $sqls = array();
+ $parameters = array();
+
+ foreach ($this->specifications as $name => $specification) {
+ $parameters[$name] = $this->{'process' . $name}(
+ $adapterPlatform,
+ null,
+ null,
+ $sqls,
+ $parameters
+ );
+
+ if ($specification && is_array($parameters[$name])) {
+ $sqls[$name] = $this->createSqlFromSpecificationAndParameters(
+ $specification,
+ $parameters[$name]
+ );
+ }
+ }
+
+ $sql = implode(' ', $sqls);
+ return $sql;
+ }
+
+ protected function processTable(PlatformInterface $adapterPlatform = null)
+ {
+ return array($adapterPlatform->quoteIdentifier($this->table));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/SqlInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/SqlInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d911134616a62ddcf9d1284036d1040790ccbd99
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/SqlInterface.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl;
+
+use Zend\Db\Sql\SqlInterface as BaseSqlInterface;
+
+interface SqlInterface extends BaseSqlInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php
index 6f7fd0e670be8a9e7b2d3a883ba70af3a6e5093e..d7452f9688da0801b7ce391b95e9325372e8df53 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php
@@ -10,10 +10,10 @@
namespace Zend\Db\Sql;
use Zend\Db\Adapter\AdapterInterface;
-use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
use Zend\Db\Adapter\Platform\Sql92;
+use Zend\Db\Adapter\StatementContainerInterface;
/**
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php
index f46be6580c4b5221f1b8cec9e9b8afe26281f7b5..1af38099e6851f45697fa87c31163e3ed0b69f43 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php
@@ -10,10 +10,10 @@
namespace Zend\Db\Sql;
use Zend\Db\Adapter\AdapterInterface;
-use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
use Zend\Db\Adapter\Platform\Sql92;
+use Zend\Db\Adapter\StatementContainerInterface;
class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php
index f6bba5449ecfad3b0aba31b6140aa42b348a617f..b65c404ab42c90b4c3b2df244da02e1fe77f6ad7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php
@@ -10,11 +10,11 @@
namespace Zend\Db\Sql\Platform;
use Zend\Db\Adapter\AdapterInterface;
-use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\StatementContainerInterface;
+use Zend\Db\Sql\Exception;
use Zend\Db\Sql\PreparableSqlInterface;
use Zend\Db\Sql\SqlInterface;
-use Zend\Db\Sql\Exception;
class AbstractPlatform implements PlatformDecoratorInterface, PreparableSqlInterface, SqlInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
new file mode 100644
index 0000000000000000000000000000000000000000..47d3ba129c9e1579d860b512a70e57ed065e0f7c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Platform\Mysql\Ddl;
+
+use Zend\Db\Adapter\Driver\DriverInterface;
+use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Sql\Ddl\CreateTable;
+use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
+
+class CreateTableDecorator extends CreateTable implements PlatformDecoratorInterface
+{
+ /**
+ * @var CreateTable
+ */
+ protected $createTable;
+
+ /**
+ * @param CreateTable $subject
+ */
+ public function setSubject($subject)
+ {
+ $this->createTable = $subject;
+ }
+
+ /**
+ * @param null|PlatformInterface $platform
+ * @return string
+ */
+ public function getSqlString(PlatformInterface $platform = null)
+ {
+ // localize variables
+ foreach (get_object_vars($this->createTable) as $name => $value) {
+ $this->{$name} = $value;
+ }
+ return parent::getSqlString($platform);
+ }
+
+ protected function processColumns(PlatformInterface $platform = null)
+ {
+ $sqls = array();
+ foreach ($this->columns as $i => $column) {
+ $stmtContainer = $this->processExpression($column, $platform);
+ $sql = $stmtContainer->getSql();
+ $columnOptions = $column->getOptions();
+
+ foreach ($columnOptions as $coName => $coValue) {
+ switch (strtolower(str_replace(array('-', '_', ' '), '', $coName))) {
+ case 'identity':
+ case 'serial':
+ case 'autoincrement':
+ $sql .= ' AUTO_INCREMENT';
+ break;
+ /*
+ case 'primary':
+ case 'primarykey':
+ $sql .= ' PRIMARY KEY';
+ break;
+ case 'unique':
+ case 'uniquekey':
+ $sql .= ' UNIQUE KEY';
+ break;
+ */
+ case 'comment':
+ $sql .= ' COMMENT \'' . $coValue . '\'';
+ break;
+ case 'columnformat':
+ case 'format':
+ $sql .= ' COLUMN_FORMAT ' . strtoupper($coValue);
+ break;
+ case 'storage':
+ $sql .= ' STORAGE ' . strtoupper($coValue);
+ break;
+ }
+ }
+ $stmtContainer->setSql($sql);
+ $sqls[$i] = $stmtContainer;
+ }
+ return array($sqls);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
index b9b7ce25eb63942dd4dfa4bcbeee07879ab77896..fbf974a7a483280a953299748b5d15d68e2e95bc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
@@ -13,9 +13,9 @@ use Zend\Db\Sql\Platform\AbstractPlatform;
class Mysql extends AbstractPlatform
{
-
- public function __construct(SelectDecorator $selectDecorator = null)
+ public function __construct()
{
- $this->setTypeDecorator('Zend\Db\Sql\Select', ($selectDecorator) ?: new SelectDecorator());
+ $this->setTypeDecorator('Zend\Db\Sql\Select', new SelectDecorator());
+ $this->setTypeDecorator('Zend\Db\Sql\Ddl\CreateTable', new Ddl\CreateTableDecorator());
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
index 84263f90b028ccc7931a1dbff11b199e35f4f77c..5046f74876d8f78ac19d7ef8a61af4450a3d5e91 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
@@ -13,8 +13,8 @@ use Zend\Db\Adapter\AdapterInterface;
use Zend\Db\Adapter\Driver\DriverInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
-use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
use Zend\Db\Adapter\StatementContainerInterface;
+use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
use Zend\Db\Sql\Select;
class SelectDecorator extends Select implements PlatformDecoratorInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
index 4e03456e536cc8fa93dd84bbb58c4c6faef3910a..660a7e74b3ab46d4e0a2561d162f6d36d2ae78ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
@@ -11,9 +11,9 @@ namespace Zend\Db\Sql\Platform\Oracle;
use Zend\Db\Adapter\AdapterInterface;
use Zend\Db\Adapter\Driver\DriverInterface;
-use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Sql\ExpressionInterface;
use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
use Zend\Db\Sql\Select;
@@ -42,7 +42,7 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
return $table . ' ' . $alias;
}
- /**
+ /**
* @param AdapterInterface $adapter
* @param StatementContainerInterface $statementContainer
*/
@@ -117,20 +117,29 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
));
if ($parameterContainer) {
- // create bottom part of query, with offset and limit using row_number
- array_push($sqls, ') b WHERE rownum <= (:offset+:limit)) WHERE b_rownum >= (:offset + 1)');
-
- $parameterContainer->offsetSet('offset', $this->offset, $parameterContainer::TYPE_INTEGER);
- $parameterContainer->offsetSet('limit', $this->limit, $parameterContainer::TYPE_INTEGER);
+ if ($this->limit === null) {
+ array_push($sqls, ') b ) WHERE b_rownum > (:offset)');
+ $parameterContainer->offsetSet('offset', $this->offset, $parameterContainer::TYPE_INTEGER);
+ } else {
+ // create bottom part of query, with offset and limit using row_number
+ array_push($sqls, ') b WHERE rownum <= (:offset+:limit)) WHERE b_rownum >= (:offset + 1)');
+ $parameterContainer->offsetSet('offset', $this->offset, $parameterContainer::TYPE_INTEGER);
+ $parameterContainer->offsetSet('limit', $this->limit, $parameterContainer::TYPE_INTEGER);
+ }
} else {
- array_push($sqls, ') b WHERE rownum <= ('
- . (int) $this->offset
- . '+'
- . (int) $this->limit
- . ')) WHERE b_rownum >= ('
- . (int) $this->offset
- . ' + 1)'
- );
+ if ($this->limit === null) {
+ array_push($sqls, ') b ) WHERE b_rownum > ('. (int) $this->offset. ')'
+ );
+ } else {
+ array_push($sqls, ') b WHERE rownum <= ('
+ . (int) $this->offset
+ . '+'
+ . (int) $this->limit
+ . ')) WHERE b_rownum >= ('
+ . (int) $this->offset
+ . ' + 1)'
+ );
+ }
}
$sqls[self::SELECT] = $this->createSqlFromSpecificationAndParameters(
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
index 1ea32925920a99ec45b9d13251bd37136073e9bc..2b649cdcdf6dbdf90a413023e3e5b074fd817d2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
@@ -11,9 +11,9 @@ namespace Zend\Db\Sql\Platform\SqlServer;
use Zend\Db\Adapter\AdapterInterface;
use Zend\Db\Adapter\Driver\DriverInterface;
-use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
use Zend\Db\Sql\Select;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php
index 6d765f58c26a4d0ed4d3ad1bd251948284029c43..5928ecf002b7cd4d7b89e4e5685112bf4f7ef6db 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php
@@ -9,8 +9,8 @@
namespace Zend\Db\Sql\Predicate;
-use Zend\Db\Sql\Select;
use Zend\Db\Sql\Exception;
+use Zend\Db\Sql\Select;
class In implements PredicateInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
index 869fe70f1612d799b31b96ddbeff928b0e66ae12..a7c8695ad338e09cdd522aa64ad0048fce5ab94c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
@@ -96,7 +96,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
protected $prefixColumnsWithTable = true;
/**
- * @var string|TableIdentifier
+ * @var string|array|TableIdentifier
*/
protected $table = null;
@@ -148,7 +148,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
/**
* Constructor
*
- * @param null|string $table
+ * @param null|string|array|TableIdentifier $table
*/
public function __construct($table = null)
{
@@ -545,7 +545,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
/**
* Returns whether the table is read only or not.
*
- * @return boolean
+ * @return bool
*/
public function isTableReadOnly()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php
index 5d54408368e2f7764895ed42ee437667bc3d6773..940ba464a14d9acee655b4c2830c89801147b2f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php
@@ -18,7 +18,7 @@ class Sql
/** @var AdapterInterface */
protected $adapter = null;
- /** @var string */
+ /** @var string|array|TableIdentifier */
protected $table = null;
/** @var Platform\Platform */
@@ -48,10 +48,10 @@ class Sql
public function setTable($table)
{
- if (is_string($table) || $table instanceof TableIdentifier) {
+ if (is_string($table) || is_array($table) || $table instanceof TableIdentifier) {
$this->table = $table;
} else {
- throw new Exception\InvalidArgumentException('Table must be a string or instance of TableIdentifier.');
+ throw new Exception\InvalidArgumentException('Table must be a string, array or instance of TableIdentifier.');
}
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php
index 8d4c6759c060c598c0235de17f641c1008ac6846..b5455f0045c9973a4d505c9ea8103421263aff29 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php
@@ -10,10 +10,10 @@
namespace Zend\Db\Sql;
use Zend\Db\Adapter\AdapterInterface;
-use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
use Zend\Db\Adapter\Platform\Sql92;
+use Zend\Db\Adapter\StatementContainerInterface;
/**
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php
index ef3a5ce65251db623eb3552672eed02ef6f49af4..26ed20ce303ea7099c6c547e1cad958eb86288fb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php
@@ -66,7 +66,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
/**
*
- * @var integer
+ * @var int
*/
protected $lastInsertValue = null;
@@ -415,7 +415,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
/**
* Get last insert value
*
- * @return integer
+ * @return int
*/
public function getLastInsertValue()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
index 1122ccfe02d84a7816517d8f0f3d0d9c3046831d..b5d8ab6cf278ebf9e8b569e2c5955ec6f6e059d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
@@ -10,8 +10,8 @@
namespace Zend\Db\TableGateway\Feature;
use Zend\Db\Sql\Insert;
-use Zend\Db\Adapter\Driver\StatementInterface;
use Zend\Db\Adapter\Driver\ResultInterface;
+use Zend\Db\Adapter\Driver\StatementInterface;
class SequenceFeature extends AbstractFeature
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/composer.json b/vendor/zendframework/zendframework/library/Zend/Db/composer.json
index 098156a3658c1e84c1bea370c777f757840f335d..c926eecbe27c519acbbd5c3056f4dde6478b960d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Db/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Debug/composer.json b/vendor/zendframework/zendframework/library/Zend/Debug/composer.json
index 9f62c7e0c101a64807fc67c0a2f87526952ee56c..28856f3c028c76230b42869961a26e3d02600046 100644
--- a/vendor/zendframework/zendframework/library/Zend/Debug/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Debug/composer.json
@@ -21,8 +21,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Config.php b/vendor/zendframework/zendframework/library/Zend/Di/Config.php
index 180ef81b79b11c60fa7a50c3b529194ee47d4fd7..7a94729d79f547a307ef06775831da2ae396b549 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Config.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Config.php
@@ -10,9 +10,9 @@
namespace Zend\Di;
use Traversable;
-use Zend\Stdlib\ArrayUtils;
use Zend\Di\Definition\ArrayDefinition;
use Zend\Di\Definition\RuntimeDefinition;
+use Zend\Stdlib\ArrayUtils;
/**
* Configures Di instances
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php
index b1cd14b8f88c33c730d7e2436c237ac87d198606..65113b7f24936016343b65af15ff2154d4266918 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php
@@ -9,6 +9,8 @@
namespace Zend\Di\Definition;
+use Zend\Di\Definition\Builder\InjectionMethod;
+
/**
* Class definitions based on a given array
*/
@@ -28,6 +30,15 @@ class ArrayDefinition implements DefinitionInterface
// force lower names
$dataArray[$class] = array_change_key_case($dataArray[$class], CASE_LOWER);
}
+ foreach ($dataArray as $class => $definition) {
+ if (isset($definition['methods']) && is_array($definition['methods'])) {
+ foreach ($definition['methods'] as $type => $requirement) {
+ if (!is_int($requirement)) {
+ $dataArray[$class]['methods'][$type] = InjectionMethod::detectMethodRequirement($requirement);
+ }
+ }
+ }
+ }
$this->dataArray = $dataArray;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php
index a19cb6177bdf518ea7089813ead7d5426f72c6d6..41e6f242d45914b77f9d99efd272df3a78c5cd2c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php
@@ -9,6 +9,8 @@
namespace Zend\Di\Definition\Builder;
+use Zend\Di\Di;
+
/**
* Definitions for an injection endpoint method
*/
@@ -55,7 +57,7 @@ class InjectionMethod
$this->parameters[] = array(
$name,
$class,
- ($isRequired == null) ? true : false,
+ self::detectMethodRequirement($isRequired),
$default,
);
@@ -69,4 +71,51 @@ class InjectionMethod
{
return $this->parameters;
}
+
+ /**
+ *
+ * @param mixed $requirement
+ * @return int
+ */
+ public static function detectMethodRequirement($requirement)
+ {
+ if (is_bool($requirement)) {
+ return $requirement ? Di::METHOD_IS_REQUIRED : Di::METHOD_IS_OPTIONAL;
+ }
+
+ if (null === $requirement) {
+ //This is mismatch to ClassDefinition::addMethod is it ok ? is optional?
+ return Di::METHOD_IS_REQUIRED;
+ }
+
+ if (is_int($requirement)) {
+ return $requirement;
+ }
+
+ if (is_string($requirement)) {
+ switch (strtolower($requirement)) {
+ default:
+ case "require":
+ case "required":
+ return Di::METHOD_IS_REQUIRED;
+ break;
+ case "aware":
+ return Di::METHOD_IS_AWARE;
+ break;
+ case "optional":
+ return Di::METHOD_IS_OPTIONAL;
+ break;
+ case "constructor":
+ return Di::MEHTOD_IS_CONSTRUCTOR;
+ break;
+ case "instantiator":
+ return Di::METHOD_IS_INSTANTIATOR;
+ break;
+ case "eager":
+ return Di::METHOD_IS_EAGER;
+ break;
+ }
+ }
+ return 0;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php
index e9e929ed0673f57410ab30b70e6de85b890dbd5b..0d3fd52d7f6b9efbd6b69e013b0de0100b9133fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php
@@ -9,6 +9,9 @@
namespace Zend\Di\Definition;
+use Zend\Di\Definition\Builder\InjectionMethod;
+use Zend\Di\Di;
+
/**
* Class definitions for a single class
*/
@@ -71,15 +74,21 @@ class ClassDefinition implements DefinitionInterface, PartialMarker
/**
* @param string $method
- * @param bool|null $isRequired
+ * @param mixed|bool|null $isRequired
* @return self
*/
public function addMethod($method, $isRequired = null)
{
- if ($isRequired === null) {
- $isRequired = ($method === '__construct') ? true : false;
+ if ($isRequired === null) {
+ if ($method === '__construct') {
+ $methodRequirementType = Di::METHOD_IS_CONSTRUCTOR;
+ }
+ $methodRequirementType = Di::METHOD_IS_OPTIONAL;
+ } else {
+ $methodRequirementType = InjectionMethod::detectMethodRequirement($isRequired);
}
- $this->methods[$method] = (bool) $isRequired;
+
+ $this->methods[$method] = $methodRequirementType;
return $this;
}
@@ -93,7 +102,11 @@ class ClassDefinition implements DefinitionInterface, PartialMarker
public function addMethodParameter($method, $parameterName, array $parameterInfo)
{
if (!array_key_exists($method, $this->methods)) {
- $this->methods[$method] = ($method === '__construct') ? true : false;
+ if ($method === '__construct') {
+ $this->methods[$method] = Di::METHOD_IS_CONSTRUCTOR;
+ } else {
+ $this->methods[$method] = Di::METHOD_IS_OPTIONAL;
+ }
}
if (!array_key_exists($method, $this->methodParameters)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php
index 011313ed435827c65cd45e7af74021f777eff7e1..9df696ed2dbf70c83896de1ea143cc8c0183ff27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php
@@ -12,6 +12,7 @@ namespace Zend\Di\Definition;
use Zend\Code\Annotation\AnnotationCollection;
use Zend\Code\Reflection;
use Zend\Di\Definition\Annotation;
+use Zend\Di\Di;
/**
* Class definitions based on runtime reflection
@@ -248,7 +249,7 @@ class RuntimeDefinition implements DefinitionInterface
}
if ($rClass->hasMethod('__construct')) {
- $def['methods']['__construct'] = true; // required
+ $def['methods']['__construct'] = Di::METHOD_IS_CONSTRUCTOR; // required
$this->processParams($def, $rClass, $rClass->getMethod('__construct'));
}
@@ -266,7 +267,8 @@ class RuntimeDefinition implements DefinitionInterface
if (($annotations instanceof AnnotationCollection)
&& $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Inject')) {
- $def['methods'][$methodName] = true;
+ // use '@inject' and search for parameters
+ $def['methods'][$methodName] = Di::METHOD_IS_EAGER;
$this->processParams($def, $rClass, $rMethod);
continue;
}
@@ -278,7 +280,7 @@ class RuntimeDefinition implements DefinitionInterface
foreach ($methodPatterns as $methodInjectorPattern) {
preg_match($methodInjectorPattern, $methodName, $matches);
if ($matches) {
- $def['methods'][$methodName] = false; // check ot see if this is required?
+ $def['methods'][$methodName] = Di::METHOD_IS_OPTIONAL; // check ot see if this is required?
$this->processParams($def, $rClass, $rMethod);
continue 2;
}
@@ -304,7 +306,7 @@ class RuntimeDefinition implements DefinitionInterface
// constructor not allowed in interfaces
continue;
}
- $def['methods'][$rMethod->getName()] = true;
+ $def['methods'][$rMethod->getName()] = Di::METHOD_IS_AWARE;
$this->processParams($def, $rClass, $rMethod);
}
continue 2;
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Di.php b/vendor/zendframework/zendframework/library/Zend/Di/Di.php
index b2404b27e37f4d46e06e5c2007bf1e82fa5534b1..b68791d7d33bc9ee3122ed9e084417aeeb7e3eb7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Di.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Di.php
@@ -11,6 +11,8 @@ namespace Zend\Di;
use Closure;
use ReflectionClass;
+use Zend\Di\Exception\RuntimeException as DiRuntimeException;
+use Zend\ServiceManager\Exception\ExceptionInterface as ServiceManagerException;
/**
* Dependency injector that can generate instances using class definitions and configured instance parameters
@@ -46,6 +48,56 @@ class Di implements DependencyInjectionInterface
*/
protected $references = array();
+ /**
+ * Resolve method policy
+ *
+ * EAGER: explore type preference or go through
+ */
+ const RESOLVE_EAGER = 1;
+
+ /**
+ * Resolve method policy
+ *
+ * STRICT: explore type preference or throw exception
+ */
+ const RESOLVE_STRICT = 2;
+
+ /**
+ *
+ * use only specified parameters
+ */
+ const METHOD_IS_OPTIONAL = 0;
+
+ /**
+ *
+ * resolve mode RESOLVE_EAGER
+ */
+ const METHOD_IS_AWARE = 1;
+
+ /**
+ *
+ * resolve mode RESOLVE_EAGER | RESOLVE_STRICT
+ */
+ const METHOD_IS_CONSTRUCTOR = 3;
+
+ /**
+ *
+ * resolve mode RESOLVE_EAGER | RESOLVE_STRICT
+ */
+ const METHOD_IS_INSTANTIATOR = 3;
+
+ /**
+ *
+ * resolve mode RESOLVE_EAGER | RESOLVE_STRICT
+ */
+ const METHOD_IS_REQUIRED = 3;
+
+ /**
+ *
+ * resolve mode RESOLVE_EAGER
+ */
+ const METHOD_IS_EAGER = 1;
+
/**
* Constructor
*
@@ -308,9 +360,9 @@ class Di implements DependencyInjectionInterface
if ($injectionMethods) {
foreach ($injectionMethods as $type => $typeInjectionMethods) {
- foreach ($typeInjectionMethods as $typeInjectionMethod => $methodIsRequired) {
+ foreach ($typeInjectionMethods as $typeInjectionMethod => $methodRequirementType) {
if (!isset($calledMethods[$typeInjectionMethod])) {
- if ($this->resolveAndCallInjectionMethodForInstance($instance, $typeInjectionMethod, $params, $instanceAlias, $methodIsRequired, $type)) {
+ if ($this->resolveAndCallInjectionMethodForInstance($instance, $typeInjectionMethod, $params, $instanceAlias, $methodRequirementType, $type)) {
$calledMethods[$typeInjectionMethod] = true;
}
}
@@ -346,14 +398,14 @@ class Di implements DependencyInjectionInterface
foreach ($objectsToInject as $objectToInject) {
$calledMethods = array('__construct' => true);
foreach ($injectionMethods as $type => $typeInjectionMethods) {
- foreach ($typeInjectionMethods as $typeInjectionMethod => $methodIsRequired) {
+ foreach ($typeInjectionMethods as $typeInjectionMethod => $methodRequirementType) {
if (!isset($calledMethods[$typeInjectionMethod])) {
$methodParams = $definitions->getMethodParameters($type, $typeInjectionMethod);
if ($methodParams) {
foreach ($methodParams as $methodParam) {
$objectToInjectClass = $this->getClass($objectToInject);
if ($objectToInjectClass == $methodParam[1] || self::isSubclassOf($objectToInjectClass, $methodParam[1])) {
- if ($this->resolveAndCallInjectionMethodForInstance($instance, $typeInjectionMethod, array($methodParam[0] => $objectToInject), $instanceAlias, true, $type)) {
+ if ($this->resolveAndCallInjectionMethodForInstance($instance, $typeInjectionMethod, array($methodParam[0] => $objectToInject), $instanceAlias, self::METHOD_IS_REQUIRED, $type)) {
$calledMethods[$typeInjectionMethod] = true;
}
continue 3;
@@ -367,7 +419,7 @@ class Di implements DependencyInjectionInterface
}
if ($methodsToCall) {
foreach ($methodsToCall as $methodInfo) {
- $this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $instanceAlias, true, $instanceClass);
+ $this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $instanceAlias, self::METHOD_IS_REQUIRED, $instanceClass);
}
}
}
@@ -391,7 +443,7 @@ class Di implements DependencyInjectionInterface
{
$callParameters = array();
if ($this->definitions->hasMethod($class, '__construct')) {
- $callParameters = $this->resolveMethodParameters($class, '__construct', $params, $alias, true, true);
+ $callParameters = $this->resolveMethodParameters($class, '__construct', $params, $alias, self::METHOD_IS_CONSTRUCTOR, true);
}
// Hack to avoid Reflection in most common use cases
@@ -438,7 +490,7 @@ class Di implements DependencyInjectionInterface
$callParameters = array();
if ($this->definitions->hasMethod($class, $method)) {
- $callParameters = $this->resolveMethodParameters($class, $method, $params, $alias, true, true);
+ $callParameters = $this->resolveMethodParameters($class, $method, $params, $alias, self::METHOD_IS_INSTANTIATOR, true);
}
return call_user_func_array($callback, $callParameters);
@@ -452,14 +504,14 @@ class Di implements DependencyInjectionInterface
* @param string $method
* @param array $params
* @param string $alias
- * @param bool $methodIsRequired
+ * @param bool $methodRequirementType
* @param string|null $methodClass
* @return bool
*/
- protected function resolveAndCallInjectionMethodForInstance($instance, $method, $params, $alias, $methodIsRequired, $methodClass = null)
+ protected function resolveAndCallInjectionMethodForInstance($instance, $method, $params, $alias, $methodRequirementType, $methodClass = null)
{
$methodClass = ($methodClass) ?: $this->getClass($instance);
- $callParameters = $this->resolveMethodParameters($methodClass, $method, $params, $alias, $methodIsRequired);
+ $callParameters = $this->resolveMethodParameters($methodClass, $method, $params, $alias, $methodRequirementType);
if ($callParameters == false) {
return false;
}
@@ -479,14 +531,24 @@ class Di implements DependencyInjectionInterface
* @param string $method
* @param array $callTimeUserParams
* @param string $alias
- * @param bool $methodIsRequired
+ * @param int|bolean $methodRequirementType
* @param bool $isInstantiator
* @throws Exception\MissingPropertyException
* @throws Exception\CircularDependencyException
* @return array
*/
- protected function resolveMethodParameters($class, $method, array $callTimeUserParams, $alias, $methodIsRequired, $isInstantiator = false)
+ protected function resolveMethodParameters($class, $method, array $callTimeUserParams, $alias, $methodRequirementType, $isInstantiator = false)
{
+ //for BC
+ if (is_bool($methodRequirementType)) {
+ if ($isInstantiator) {
+ $methodRequirementType = Di::METHOD_IS_INSTANTIATOR;
+ } elseif ($methodRequirementType) {
+ $methodRequirementType = Di::METHOD_IS_REQUIRED;
+ } else {
+ $methodRequirementType = Di::METHOD_IS_OPTIONAL;
+ }
+ }
// parameters for this method, in proper order, to be returned
$resolvedParams = array();
@@ -495,9 +557,9 @@ class Di implements DependencyInjectionInterface
// computed parameters array
$computedParams = array(
- 'value' => array(),
- 'required' => array(),
- 'optional' => array()
+ 'value' => array(),
+ 'retrieval' => array(),
+ 'optional' => array()
);
// retrieve instance configurations for all contexts
@@ -553,13 +615,13 @@ class Di implements DependencyInjectionInterface
if ($type !== false && is_string($callTimeCurValue)) {
if ($this->instanceManager->hasAlias($callTimeCurValue)) {
// was an alias provided?
- $computedParams['required'][$fqParamPos] = array(
+ $computedParams['retrieval'][$fqParamPos] = array(
$callTimeUserParams[$name],
$this->instanceManager->getClassFromAlias($callTimeCurValue)
);
} elseif ($this->definitions->hasClass($callTimeUserParams[$name])) {
// was a known class provided?
- $computedParams['required'][$fqParamPos] = array(
+ $computedParams['retrieval'][$fqParamPos] = array(
$callTimeCurValue,
$callTimeCurValue
);
@@ -598,13 +660,13 @@ class Di implements DependencyInjectionInterface
$computedParams['value'][$fqParamPos] = $iConfigCurValue;
} elseif (is_string($iConfigCurValue)
&& isset($aliases[$iConfigCurValue])) {
- $computedParams['required'][$fqParamPos] = array(
+ $computedParams['retrieval'][$fqParamPos] = array(
$iConfig[$thisIndex]['parameters'][$name],
$this->instanceManager->getClassFromAlias($iConfigCurValue)
);
} elseif (is_string($iConfigCurValue)
&& $this->definitions->hasClass($iConfigCurValue)) {
- $computedParams['required'][$fqParamPos] = array(
+ $computedParams['retrieval'][$fqParamPos] = array(
$iConfigCurValue,
$iConfigCurValue
);
@@ -625,45 +687,49 @@ class Di implements DependencyInjectionInterface
// PRIORITY 6 - globally preferred implementations
// next consult alias level preferred instances
- if ($alias && $this->instanceManager->hasTypePreferences($alias)) {
- $pInstances = $this->instanceManager->getTypePreferences($alias);
- foreach ($pInstances as $pInstance) {
- if (is_object($pInstance)) {
- $computedParams['value'][$fqParamPos] = $pInstance;
- continue 2;
- }
- $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
- $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
- if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
- $computedParams['required'][$fqParamPos] = array($pInstance, $pInstanceClass);
- continue 2;
+ // RESOLVE_EAGER wants to inject the cross-cutting concerns.
+ // If you want to retrieve an instance from TypePreferences,
+ // use AwareInterface or specify the method requirement option METHOD_IS_EAGER at ClassDefinition
+ if ($methodRequirementType & self::RESOLVE_EAGER) {
+ if ($alias && $this->instanceManager->hasTypePreferences($alias)) {
+ $pInstances = $this->instanceManager->getTypePreferences($alias);
+ foreach ($pInstances as $pInstance) {
+ if (is_object($pInstance)) {
+ $computedParams['value'][$fqParamPos] = $pInstance;
+ continue 2;
+ }
+ $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
+ $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
+ if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
+ $computedParams['retrieval'][$fqParamPos] = array($pInstance, $pInstanceClass);
+ continue 2;
+ }
}
}
- }
- // next consult class level preferred instances
- if ($type && $this->instanceManager->hasTypePreferences($type)) {
- $pInstances = $this->instanceManager->getTypePreferences($type);
- foreach ($pInstances as $pInstance) {
- if (is_object($pInstance)) {
- $computedParams['value'][$fqParamPos] = $pInstance;
- continue 2;
- }
- $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
- $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
- if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
- $computedParams['required'][$fqParamPos] = array($pInstance, $pInstanceClass);
- continue 2;
+ // next consult class level preferred instances
+ if ($type && $this->instanceManager->hasTypePreferences($type)) {
+ $pInstances = $this->instanceManager->getTypePreferences($type);
+ foreach ($pInstances as $pInstance) {
+ if (is_object($pInstance)) {
+ $computedParams['value'][$fqParamPos] = $pInstance;
+ continue 2;
+ }
+ $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
+ $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
+ if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
+ $computedParams['retrieval'][$fqParamPos] = array($pInstance, $pInstanceClass);
+ continue 2;
+ }
}
}
}
-
if (!$isRequired) {
$computedParams['optional'][$fqParamPos] = true;
}
- if ($type && $isRequired && $methodIsRequired) {
- $computedParams['required'][$fqParamPos] = array($type, $type);
+ if ($type && $isRequired && ($methodRequirementType & self::RESOLVE_EAGER)) {
+ $computedParams['retrieval'][$fqParamPos] = array($type, $type);
}
}
@@ -675,26 +741,62 @@ class Di implements DependencyInjectionInterface
if (isset($computedParams['value'][$fqParamPos])) {
// if there is a value supplied, use it
$resolvedParams[$index] = $computedParams['value'][$fqParamPos];
- } elseif (isset($computedParams['required'][$fqParamPos])) {
+ } elseif (isset($computedParams['retrieval'][$fqParamPos])) {
// detect circular dependencies! (they can only happen in instantiators)
- if ($isInstantiator && in_array($computedParams['required'][$fqParamPos][1], $this->currentDependencies)) {
+ if ($isInstantiator && in_array($computedParams['retrieval'][$fqParamPos][1], $this->currentDependencies)) {
throw new Exception\CircularDependencyException(
"Circular dependency detected: $class depends on {$value[1]} and viceversa"
);
}
array_push($this->currentDependencies, $class);
- $dConfig = $this->instanceManager->getConfig($computedParams['required'][$fqParamPos][0]);
+ $dConfig = $this->instanceManager->getConfig($computedParams['retrieval'][$fqParamPos][0]);
- if ($dConfig['shared'] === false) {
- $resolvedParams[$index] = $this->newInstance($computedParams['required'][$fqParamPos][0], $callTimeUserParams, false);
- } else {
- $resolvedParams[$index] = $this->get($computedParams['required'][$fqParamPos][0], $callTimeUserParams);
+ try {
+ if ($dConfig['shared'] === false) {
+ $resolvedParams[$index] = $this->newInstance($computedParams['retrieval'][$fqParamPos][0], $callTimeUserParams, false);
+ } else {
+ $resolvedParams[$index] = $this->get($computedParams['retrieval'][$fqParamPos][0], $callTimeUserParams);
+ }
+ } catch (DiRuntimeException $e) {
+ if ($methodRequirementType & self::RESOLVE_STRICT) {
+ //finally ( be aware to do at the end of flow)
+ array_pop($this->currentDependencies);
+ // if this item was marked strict,
+ // plus it cannot be resolve, and no value exist, bail out
+ throw new Exception\MissingPropertyException(sprintf(
+ 'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
+ (($value[0] === null) ? 'value' : 'instance/object' )
+ ),
+ $e->getCode(),
+ $e);
+ } else {
+ //finally ( be aware to do at the end of flow)
+ array_pop($this->currentDependencies);
+ return false;
+ }
+ } catch (ServiceManagerException $e) {
+ // Zend\ServiceManager\Exception\ServiceNotCreatedException
+ if ($methodRequirementType & self::RESOLVE_STRICT) {
+ //finally ( be aware to do at the end of flow)
+ array_pop($this->currentDependencies);
+ // if this item was marked strict,
+ // plus it cannot be resolve, and no value exist, bail out
+ throw new Exception\MissingPropertyException(sprintf(
+ 'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
+ (($value[0] === null) ? 'value' : 'instance/object' )
+ ),
+ $e->getCode(),
+ $e);
+ } else {
+ //finally ( be aware to do at the end of flow)
+ array_pop($this->currentDependencies);
+ return false;
+ }
}
-
array_pop($this->currentDependencies);
} elseif (!array_key_exists($fqParamPos, $computedParams['optional'])) {
- if ($methodIsRequired) {
+ if ($methodRequirementType & self::RESOLVE_STRICT) {
// if this item was not marked as optional,
// plus it cannot be resolve, and no value exist, bail out
throw new Exception\MissingPropertyException(sprintf(
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/composer.json b/vendor/zendframework/zendframework/library/Zend/Di/composer.json
index fc3b5839c334fe0a9b6e6802ee6e6b16e8a2e17b..a767b4ce4ea978701048048c49d5807208c44bf0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Di/composer.json
@@ -19,8 +19,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php b/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
index 5ada8646dd209a281d4326056181d5b8c12185b2..e251413630717e7616dc79ae9c431a61f486a4fb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
@@ -9,12 +9,12 @@
namespace Zend\Dom;
+use ArrayAccess;
use Countable;
use DOMDocument;
use DOMNodeList;
use DOMNode;
use Iterator;
-use ArrayAccess;
/**
* Nodelist for DOM XPath query
@@ -52,11 +52,10 @@ class NodeList implements Iterator, Countable, ArrayAccess
/**
* Constructor
*
- * @param string $cssQuery
- * @param string|array $xpathQuery
- * @param DOMDocument $document
- * @param DOMNodeList $nodeList
- * @return void
+ * @param string $cssQuery
+ * @param string|array $xpathQuery
+ * @param DOMDocument $document
+ * @param DOMNodeList $nodeList
*/
public function __construct($cssQuery, $xpathQuery, DOMDocument $document, DOMNodeList $nodeList)
{
@@ -192,7 +191,8 @@ class NodeList implements Iterator, Countable, ArrayAccess
/**
* ArrayAccess: set offset
*
- * @return void
+ * @param mixed $key
+ * @param mixed $value
* @throws Exception\BadMethodCallException when attemptingn to write to a read-only item
*/
public function offsetSet($key, $value)
@@ -203,7 +203,7 @@ class NodeList implements Iterator, Countable, ArrayAccess
/**
* ArrayAccess: unset offset
*
- * @return void
+ * @param mixed $key
* @throws Exception\BadMethodCallException when attemptingn to unset a read-only item
*/
public function offsetUnset($key)
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/composer.json b/vendor/zendframework/zendframework/library/Zend/Dom/composer.json
index 47d4ac327e695b1cc532a7a5e25eb0c742059271..2524105858f04932093e8dde393fef64db56ab86 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
index 91a51404806fe8df3be36b2886db4b05e4d242a5..38ab113e9db5c32164c76b347e8a9465fb9fa49d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
@@ -49,7 +49,7 @@ class Escaper
*
* @var string
*/
- protected $htmlSpecialCharsFlags = \ENT_QUOTES;
+ protected $htmlSpecialCharsFlags = ENT_QUOTES;
/**
* Static Matcher which escapes characters for HTML Attribute contexts
@@ -119,7 +119,7 @@ class Escaper
}
if (defined('ENT_SUBSTITUTE')) {
- $this->htmlSpecialCharsFlags|= \ENT_SUBSTITUTE;
+ $this->htmlSpecialCharsFlags|= ENT_SUBSTITUTE;
}
// set matcher callbacks
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json b/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json
index c30c3f7cdc118cb32f0edc14d4d0bbd15fb4afd0..3b2f2b602d4f490938dea11dd065c99bc3216268 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json
@@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php b/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
new file mode 100644
index 0000000000000000000000000000000000000000..4d4a443d0d8174df77928e48342092d87b6cab7f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\EventManager;
+
+
+/**
+ * Abstract aggregate listener
+ */
+abstract class AbstractListenerAggregate implements ListenerAggregateInterface
+{
+ /**
+ * @var \Zend\Stdlib\CallbackHandler[]
+ */
+ protected $listeners = array();
+
+ /**
+ * {@inheritDoc}
+ */
+ public function detach(EventManagerInterface $events)
+ {
+ foreach ($this->listeners as $index => $callback) {
+ if ($events->detach($callback)) {
+ unset($this->listeners[$index]);
+ }
+ }
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php
index 3f4c58fc7bbe74a6734e8cb5e3803f56cbf50997..de51b1e96ada1202ce54a20133c5b8c239c9cf42 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php
@@ -462,10 +462,6 @@ class EventManager implements EventManagerInterface
foreach ($listeners as $listener) {
$listenerCallback = $listener->getCallback();
- if (!$listenerCallback) {
- $this->detach($listener);
- continue;
- }
// Trigger the listener's callback, and push its result onto the
// response collection
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php
index 7b610b3f4a9b0608f5452cc9e6b1911aed765cdf..4d10e71da02f205ac1bad4c85bab3b90fcdb3309 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php
@@ -26,6 +26,8 @@ interface ListenerAggregateInterface
* implementation will pass this to the aggregate.
*
* @param EventManagerInterface $events
+ *
+ * @return void
*/
public function attach(EventManagerInterface $events);
@@ -33,6 +35,8 @@ interface ListenerAggregateInterface
* Detach all previously attached listeners
*
* @param EventManagerInterface $events
+ *
+ * @return void
*/
public function detach(EventManagerInterface $events);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateTrait.php b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..fabedc03cd8f8abe3a7e3256a265b72e3aa84544
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateTrait.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\EventManager;
+
+/**
+ * Provides logic to easily create aggregate listeners, without worrying about
+ * manually detaching events
+ */
+trait ListenerAggregateTrait
+{
+ /**
+ * @var \Zend\Stdlib\CallbackHandler[]
+ */
+ protected $listeners = array();
+
+ /**
+ * {@inheritDoc}
+ */
+ public function detach(EventManagerInterface $events)
+ {
+ foreach ($this->listeners as $index => $callback) {
+ if ($events->detach($callback)) {
+ unset($this->listeners[$index]);
+ }
+ }
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
index b215954130b5f2bc89697f9d764518abc769f22a..4458efafb2f1b7cd2d8ae48835c410c848464a38 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
@@ -22,8 +22,6 @@ class StaticEventManager extends SharedEventManager
/**
* Singleton
- *
- * @return void
*/
protected function __construct()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json b/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json
index 577b7697eff03d10b19aa00e8b5c012b38c10925..62ccee5c4fbc8d516da34199c8af8ec613a86114 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
index 7aee32d9242a273356aa6956d5601c8fa0960a59..fb2bd8f79d4b49bd8a467b53460b615fce001e85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
@@ -10,10 +10,9 @@
namespace Zend\Feed\PubSubHubbub;
use Traversable;
+use Zend\Feed\Uri;
use Zend\Http\Request as HttpRequest;
use Zend\Stdlib\ArrayUtils;
-use Zend\Uri;
-use Zend\Version\Version;
class Publisher
{
@@ -101,7 +100,7 @@ class Publisher
*/
public function addHubUrl($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter "url"'
. ' of "' . $url . '" must be a non-empty string and a valid'
. 'URL');
@@ -160,7 +159,7 @@ class Publisher
*/
public function addUpdatedTopicUrl($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter "url"'
. ' of "' . $url . '" must be a non-empty string and a valid'
. 'URL');
@@ -220,7 +219,7 @@ class Publisher
*/
public function notifyHub($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter "url"'
. ' of "' . $url . '" must be a non-empty string and a valid'
. 'URL');
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php
index df4448db390f8955e1cbf49c770bec13005a8ebd..7171694d20a45910fc2be25829f2605f8f55b584 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php
@@ -12,10 +12,9 @@ namespace Zend\Feed\PubSubHubbub;
use DateInterval;
use DateTime;
use Traversable;
+use Zend\Feed\Uri;
use Zend\Http\Request as HttpRequest;
use Zend\Stdlib\ArrayUtils;
-use Zend\Uri;
-use Zend\Version\Version;
class Subscriber
{
@@ -194,7 +193,7 @@ class Subscriber
*/
public function setTopicUrl($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter "url"'
.' of "' . $url . '" must be a non-empty string and a valid'
.' URL');
@@ -257,7 +256,7 @@ class Subscriber
*/
public function setCallbackUrl($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter "url"'
. ' of "' . $url . '" must be a non-empty string and a valid'
. ' URL');
@@ -327,7 +326,7 @@ class Subscriber
*/
public function addHubUrl($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter "url"'
. ' of "' . $url . '" must be a non-empty string and a valid'
. ' URL');
@@ -387,7 +386,7 @@ class Subscriber
*/
public function addAuthentication($url, array $authentication)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter "url"'
. ' of "' . $url . '" must be a non-empty string and a valid'
. ' URL');
@@ -619,7 +618,7 @@ class Subscriber
$client->setAuth($auth[0], $auth[1]);
}
$client->setUri($url);
- $client->setRawBody($this->_getRequestParameters($url, $mode));
+ $client->setRawBody($params = $this->_getRequestParameters($url, $mode));
$response = $client->send();
if ($response->getStatusCode() !== 204
&& $response->getStatusCode() !== 202
@@ -735,7 +734,7 @@ class Subscriber
'topic_url' => $params['hub.topic'],
'hub_url' => $hubUrl,
'created_time' => $now->format('Y-m-d H:i:s'),
- 'lease_seconds' => $expires,
+ 'lease_seconds' => $params['hub.lease_seconds'],
'verify_token' => hash('sha256', $params['hub.verify_token']),
'secret' => null,
'expiration_time' => $expires,
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
index 97a37231ef64677e629f3233222be1ffe55a50da..4e15e58dbaed66bceaa86a20964d65b2f4dcea50 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
@@ -11,7 +11,7 @@ namespace Zend\Feed\PubSubHubbub\Subscriber;
use Zend\Feed\PubSubHubbub;
use Zend\Feed\PubSubHubbub\Exception;
-use Zend\Uri;
+use Zend\Feed\Uri;
class Callback extends PubSubHubbub\AbstractCallback
{
@@ -161,7 +161,7 @@ class Callback extends PubSubHubbub\AbstractCallback
) {
return false;
}
- if (!Uri\UriFactory::factory($httpGetData['hub_topic'])->isValid()) {
+ if (!Uri::factory($httpGetData['hub_topic'])->isValid()) {
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Version.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Version.php
new file mode 100644
index 0000000000000000000000000000000000000000..026fe3b9a25695e2bc467d926a672fecf999a0ce
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Version.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\PubSubHubbub;
+
+abstract class Version
+{
+ const VERSION = '2';
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php
index ecfc3bfb6f3bba75a0e42601c0d657f4292da395..fcd5f60f90f8c4022ea510e61a09e073afb12cd2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php
@@ -259,7 +259,7 @@ class Atom extends AbstractEntry implements EntryInterface
/**
* Get the number of comments/replies for current entry
*
- * @return integer
+ * @return int
*/
public function getCommentCount()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php
index c2977e1b47208de7a059b5079ec926b7ffff00cc..29b437a2ca231401e84b70a46396019c084dc013 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php
@@ -102,7 +102,7 @@ interface EntryInterface
/**
* Get the number of comments/replies for current entry
*
- * @return integer
+ * @return int
*/
public function getCommentCount();
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php
index 35a063e917a299d2f6e484bf1b202cb18218006b..d68577cdf72d8810264a3477bf6ee7f2b9fce3be 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php
@@ -9,14 +9,14 @@
namespace Zend\Feed\Reader\Extension\Atom;
+use DateTime;
use DOMDocument;
use DOMElement;
use stdClass;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
-use Zend\Stdlib\DateTime;
-use Zend\Uri;
+use Zend\Feed\Uri;
class Entry extends Extension\AbstractEntry
{
@@ -170,7 +170,7 @@ class Entry extends Extension\AbstractEntry
}
if ($dateCreated) {
- $date = DateTime::createFromISO8601($dateCreated);
+ $date = new DateTime($dateCreated);
}
$this->data['datecreated'] = $date;
@@ -198,7 +198,7 @@ class Entry extends Extension\AbstractEntry
}
if ($dateModified) {
- $date = DateTime::createFromISO8601($dateModified);
+ $date = new DateTime($dateModified);
}
$this->data['datemodified'] = $date;
@@ -394,7 +394,7 @@ class Entry extends Extension\AbstractEntry
/**
* Get the number of comments/replies for current entry
*
- * @return integer
+ * @return int
*/
public function getCommentCount()
{
@@ -548,10 +548,10 @@ class Entry extends Extension\AbstractEntry
*/
protected function absolutiseUri($link)
{
- if (!Uri\UriFactory::factory($link)->isAbsolute()) {
+ if (!Uri::factory($link)->isAbsolute()) {
if ($this->getBaseUrl() !== null) {
$link = $this->getBaseUrl() . $link;
- if (!Uri\UriFactory::factory($link)->isValid()) {
+ if (!Uri::factory($link)->isValid()) {
$link = null;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php
index c5b9f543741f49b23b4f7a781e53fa332aa53c24..83e9ccae7c894a9be9be9079716c9408cf9c2a37 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php
@@ -9,12 +9,12 @@
namespace Zend\Feed\Reader\Extension\Atom;
+use DateTime;
use DOMElement;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
-use Zend\Stdlib\DateTime;
-use Zend\Uri;
+use Zend\Feed\Uri;
class Feed extends Extension\AbstractFeed
{
@@ -120,7 +120,7 @@ class Feed extends Extension\AbstractFeed
}
if ($dateCreated) {
- $date = DateTime::createFromISO8601($dateCreated);
+ $date = new DateTime($dateCreated);
}
$this->data['datecreated'] = $date;
@@ -148,7 +148,7 @@ class Feed extends Extension\AbstractFeed
}
if ($dateModified) {
- $date = DateTime::createFromISO8601($dateModified);
+ $date = new DateTime($dateModified);
}
$this->data['datemodified'] = $date;
@@ -276,7 +276,7 @@ class Feed extends Extension\AbstractFeed
if (!$imageUrl) {
$image = null;
} else {
- $image = array('uri'=>$imageUrl);
+ $image = array('uri' => $imageUrl);
}
$this->data['image'] = $image;
@@ -482,10 +482,10 @@ class Feed extends Extension\AbstractFeed
*/
protected function absolutiseUri($link)
{
- if (!Uri\UriFactory::factory($link)->isAbsolute()) {
+ if (!Uri::factory($link)->isAbsolute()) {
if ($this->getBaseUrl() !== null) {
$link = $this->getBaseUrl() . $link;
- if (!Uri\UriFactory::factory($link)->isValid()) {
+ if (!Uri::factory($link)->isValid()) {
$link = null;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
index ec6df312efc49734d189601a30e64461aa39235b..0352102c634d8f96e2857410260bcbb803578f20 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
@@ -53,9 +53,7 @@ class Entry extends Extension\AbstractEntry
$licenses = array_unique($licenses);
} else {
- $cc = new Feed(
- $this->domDocument, $this->data['type'], $this->xpath
- );
+ $cc = new Feed();
$licenses = $cc->getLicenses();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
index e4eca7513605277dd06261d1bf0ca4a3cdaa9980..7ec5304e953c83de628c1341a07f9dc34c1e3113 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
@@ -9,10 +9,10 @@
namespace Zend\Feed\Reader\Extension\DublinCore;
+use DateTime;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
-use Zend\Stdlib\DateTime;
class Entry extends Extension\AbstractEntry
{
@@ -217,7 +217,7 @@ class Entry extends Extension\AbstractEntry
}
if ($date) {
- $d = DateTime::createFromISO8601($date);
+ $d = new DateTime($date);
}
$this->data['date'] = $d;
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
index 27884e409dc542105db410f69fca12b01b17cb99..61959c4a06d83ff02be40d2821cbac1410c7cb97 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
@@ -9,10 +9,10 @@
namespace Zend\Feed\Reader\Extension\DublinCore;
+use DateTime;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
-use Zend\Stdlib\DateTime;
class Feed extends Extension\AbstractFeed
{
@@ -226,7 +226,7 @@ class Feed extends Extension\AbstractFeed
}
if ($date) {
- $d = DateTime::createFromISO8601($date);
+ $d = new DateTime($date);
}
$this->data['date'] = $d;
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php
index 0b6d03f78136946883fc6fabf3320a6b94436bc0..b6fa68db51096ac3d3611964205ea1590ddd5603 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php
@@ -9,68 +9,72 @@
namespace Zend\Feed\Reader;
-use Zend\ServiceManager\AbstractPluginManager;
-
/**
- * Plugin manager implementation for feed reader extensions
+ * Default implementation of ExtensionManagerInterface
*
- * Validation checks that we have an Extension\AbstractEntry or
- * Extension\AbstractFeed.
+ * Decorator of ExtensionPluginManager.
*/
-class ExtensionManager extends AbstractPluginManager
+class ExtensionManager implements ExtensionManagerInterface
{
+ protected $pluginManager;
+
/**
- * Default set of extension classes
+ * Constructor
+ *
+ * Seeds the extension manager with a plugin manager; if none provided,
+ * creates an instance.
*
- * @var array
+ * @param null|ExtensionPluginManager $pluginManager
*/
- protected $invokableClasses = array(
- 'atomentry' => 'Zend\Feed\Reader\Extension\Atom\Entry',
- 'atomfeed' => 'Zend\Feed\Reader\Extension\Atom\Feed',
- 'contententry' => 'Zend\Feed\Reader\Extension\Content\Entry',
- 'creativecommonsentry' => 'Zend\Feed\Reader\Extension\CreativeCommons\Entry',
- 'creativecommonsfeed' => 'Zend\Feed\Reader\Extension\CreativeCommons\Feed',
- 'dublincoreentry' => 'Zend\Feed\Reader\Extension\DublinCore\Entry',
- 'dublincorefeed' => 'Zend\Feed\Reader\Extension\DublinCore\Feed',
- 'podcastentry' => 'Zend\Feed\Reader\Extension\Podcast\Entry',
- 'podcastfeed' => 'Zend\Feed\Reader\Extension\Podcast\Feed',
- 'slashentry' => 'Zend\Feed\Reader\Extension\Slash\Entry',
- 'syndicationfeed' => 'Zend\Feed\Reader\Extension\Syndication\Feed',
- 'threadentry' => 'Zend\Feed\Reader\Extension\Thread\Entry',
- 'wellformedwebentry' => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
- );
+ public function __construct(ExtensionPluginManager $pluginManager = null)
+ {
+ if (null === $pluginManager) {
+ $pluginManager = new ExtensionPluginManager();
+ }
+ $this->pluginManager = $pluginManager;
+ }
/**
- * Do not share instances
+ * Method overloading
+ *
+ * Proxy to composed ExtensionPluginManager instance.
*
- * @var bool
+ * @param string $method
+ * @param array $args
+ * @return mixed
+ * @throws Exception\BadMethodCallException
*/
- protected $shareByDefault = false;
+ public function __call($method, $args)
+ {
+ if (!method_exists($this->pluginManager, $method)) {
+ throw new Exception\BadMethodCallException(sprintf(
+ 'Method by name of %s does not exist in %s',
+ $method,
+ __CLASS__
+ ));
+ }
+ return call_user_func_array(array($this->pluginManager, $method), $args);
+ }
/**
- * Validate the plugin
- *
- * Checks that the extension loaded is of a valid type.
+ * Get the named extension
*
- * @param mixed $plugin
- * @return void
- * @throws Exception\InvalidArgumentException if invalid
+ * @param string $name
+ * @return Extension\AbstractEntry|Extension\AbstractFeed
*/
- public function validatePlugin($plugin)
+ public function get($name)
{
- if ($plugin instanceof Extension\AbstractEntry
- || $plugin instanceof Extension\AbstractFeed
- ) {
- // we're okay
- return;
- }
+ return $this->pluginManager->get($name);
+ }
- throw new Exception\InvalidArgumentException(sprintf(
- 'Plugin of type %s is invalid; must implement %s\Extension\AbstractFeed '
- . 'or %s\Extension\AbstractEntry',
- (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
- __NAMESPACE__,
- __NAMESPACE__
- ));
+ /**
+ * Do we have the named extension?
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function has($name)
+ {
+ return $this->pluginManager->has($name);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManagerInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ae9b6798e1f2e94c2f135c9069281e5b92d3479
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManagerInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader;
+
+interface ExtensionManagerInterface
+{
+ /**
+ * Do we have the extension?
+ *
+ * @param string $extension
+ * @return bool
+ */
+ public function has($extension);
+
+ /**
+ * Retrieve the extension
+ *
+ * @param string $extension
+ * @return mixed
+ */
+ public function get($extension);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionPluginManager.php
new file mode 100644
index 0000000000000000000000000000000000000000..8222ee2c1c6c578733e125b86a8dd92e68ad4e74
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionPluginManager.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader;
+
+use Zend\ServiceManager\AbstractPluginManager;
+
+/**
+ * Plugin manager implementation for feed reader extensions based on the
+ * AbstractPluginManager.
+ *
+ * Validation checks that we have an Extension\AbstractEntry or
+ * Extension\AbstractFeed.
+ */
+class ExtensionPluginManager extends AbstractPluginManager
+{
+ /**
+ * Default set of extension classes
+ *
+ * @var array
+ */
+ protected $invokableClasses = array(
+ 'atomentry' => 'Zend\Feed\Reader\Extension\Atom\Entry',
+ 'atomfeed' => 'Zend\Feed\Reader\Extension\Atom\Feed',
+ 'contententry' => 'Zend\Feed\Reader\Extension\Content\Entry',
+ 'creativecommonsentry' => 'Zend\Feed\Reader\Extension\CreativeCommons\Entry',
+ 'creativecommonsfeed' => 'Zend\Feed\Reader\Extension\CreativeCommons\Feed',
+ 'dublincoreentry' => 'Zend\Feed\Reader\Extension\DublinCore\Entry',
+ 'dublincorefeed' => 'Zend\Feed\Reader\Extension\DublinCore\Feed',
+ 'podcastentry' => 'Zend\Feed\Reader\Extension\Podcast\Entry',
+ 'podcastfeed' => 'Zend\Feed\Reader\Extension\Podcast\Feed',
+ 'slashentry' => 'Zend\Feed\Reader\Extension\Slash\Entry',
+ 'syndicationfeed' => 'Zend\Feed\Reader\Extension\Syndication\Feed',
+ 'threadentry' => 'Zend\Feed\Reader\Extension\Thread\Entry',
+ 'wellformedwebentry' => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
+ );
+
+ /**
+ * Do not share instances
+ *
+ * @var bool
+ */
+ protected $shareByDefault = false;
+
+ /**
+ * Validate the plugin
+ *
+ * Checks that the extension loaded is of a valid type.
+ *
+ * @param mixed $plugin
+ * @return void
+ * @throws Exception\InvalidArgumentException if invalid
+ */
+ public function validatePlugin($plugin)
+ {
+ if ($plugin instanceof Extension\AbstractEntry
+ || $plugin instanceof Extension\AbstractFeed
+ ) {
+ // we're okay
+ return;
+ }
+
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Plugin of type %s is invalid; must implement %s\Extension\AbstractFeed '
+ . 'or %s\Extension\AbstractEntry',
+ (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+ __NAMESPACE__,
+ __NAMESPACE__
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php
index fd95cd61e1e1cbba077ea7157bb2416640cfeeb8..cc3943854111abeaec0575da50727d25f85568b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php
@@ -386,7 +386,7 @@ class Atom extends AbstractFeed
$entries = array();
$entries = $this->xpath->evaluate('//atom:entry');
- foreach ($entries as $index=>$entry) {
+ foreach ($entries as $index => $entry) {
$this->entries[$index] = $entry;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php
index 8b89262e22f1a0f7065017f7b51bb42f51d0f122..61ce229ba442b322fe41db83579367595bc3f400 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php
@@ -683,7 +683,7 @@ class Rss extends AbstractFeed
$entries = $this->xpath->evaluate('//rss:item');
}
- foreach ($entries as $index=>$entry) {
+ foreach ($entries as $index => $entry) {
$this->entries[$index] = $entry;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php
index bc35ed56d6097789984fd9301c37950d2e2af2a2..c9476208d28cdc02744c485c67a9b68ba47a8a64 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php
@@ -11,7 +11,7 @@ namespace Zend\Feed\Reader;
use ArrayObject;
use DOMNodeList;
-use Zend\Uri;
+use Zend\Feed\Uri;
/**
*/
@@ -67,17 +67,17 @@ class FeedSet extends ArrayObject
*/
protected function absolutiseUri($link, $uri = null)
{
- $linkUri = Uri\UriFactory::factory($link);
+ $linkUri = Uri::factory($link);
if (!$linkUri->isAbsolute() or !$linkUri->isValid()) {
if ($uri !== null) {
- $uri = Uri\UriFactory::factory($uri);
+ $uri = Uri::factory($uri);
if ($link[0] !== '/') {
$link = $uri->getPath() . '/' . $link;
}
$link = $uri->getScheme() . '://' . $uri->getHost() . '/' . $this->canonicalizePath($link);
- if (!Uri\UriFactory::factory($link)->isValid()) {
+ if (!Uri::factory($link)->isValid()) {
$link = null;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc0f5f694da2380e869e4a725cde5b537061a87f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader\Http;
+
+interface ClientInterface
+{
+ /**
+ * Make a GET request to a given URI
+ *
+ * @param string $uri
+ * @return ResponseInterface
+ */
+ public function get($uri);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ResponseInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ResponseInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..5027f200545920e5fe14923a833213e554985651
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ResponseInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader\Http;
+
+interface ResponseInterface
+{
+ /**
+ * Retrieve the response body
+ *
+ * @return string
+ */
+ public function getBody();
+
+ /**
+ * Retrieve the HTTP response status code
+ *
+ * @return int
+ */
+ public function getStatusCode();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php
index c0ed1bf526e01a2a9952b8ea24295cf71bf1ea32..7f8a25c20d891f3796005b744d6e7ff82e63d99e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php
@@ -12,7 +12,7 @@ namespace Zend\Feed\Reader;
use DOMDocument;
use DOMXPath;
use Zend\Cache\Storage\StorageInterface as CacheStorage;
-use Zend\Http;
+use Zend\Http as ZendHttp;
use Zend\Stdlib\ErrorHandler;
/**
@@ -57,7 +57,7 @@ class Reader
/**
* HTTP client object to use for retrieving feeds
*
- * @var \Zend\Http\Client
+ * @var ZendHttp\Client
*/
protected static $httpClient = null;
@@ -117,24 +117,24 @@ class Reader
*
* Sets the HTTP client object to use for retrieving the feeds.
*
- * @param \Zend\Http\Client $httpClient
+ * @param ZendHttp\Client $httpClient
* @return void
*/
- public static function setHttpClient(Http\Client $httpClient)
+ public static function setHttpClient(ZendHttp\Client $httpClient)
{
static::$httpClient = $httpClient;
}
/**
- * Gets the HTTP client object. If none is set, a new \Zend\Http\Client will be used.
+ * Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used.
*
- * @return \Zend\Http\Client
+ * @return ZendHttp\Client
*/
public static function getHttpClient()
{
- if (!static::$httpClient instanceof Http\Client) {
- static::$httpClient = new Http\Client();
+ if (!static::$httpClient instanceof ZendHttp\Client) {
+ static::$httpClient = new ZendHttp\Client();
}
return static::$httpClient;
@@ -195,7 +195,7 @@ class Reader
$responseXml = '';
$client = self::getHttpClient();
$client->resetParameters();
- $headers = new Http\Headers();
+ $headers = new ZendHttp\Headers();
$client->setHeaders($headers);
$client->setUri($uri);
$cacheId = 'Zend_Feed_Reader_' . md5($uri);
@@ -256,6 +256,39 @@ class Reader
}
}
+ /**
+ * Import a feed from a remote URI
+ *
+ * Performs similarly to import(), except it uses the HTTP client passed to
+ * the method, and does not take into account cached data.
+ *
+ * Primary purpose is to make it possible to use the Reader with alternate
+ * HTTP client implementations.
+ *
+ * @param string $uri
+ * @param Http\Client $client
+ * @return self
+ * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
+ */
+ public static function importRemoteFeed($uri, Http\ClientInterface $client)
+ {
+ $response = $client->get($uri);
+ if (!$response instanceof Http\ResponseInterface) {
+ throw new Exception\RuntimeException(sprintf(
+ 'Did not receive a %s\Http\ResponseInterface from the provided HTTP client; received "%s"',
+ __NAMESPACE__,
+ (is_object($response) ? get_class($response) : gettype($response))
+ ));
+ }
+
+ if ((int) $response->getStatusCode() !== 200) {
+ throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+ }
+ $reader = static::importString($response->getBody());
+ $reader->setOriginalSourceUri($uri);
+ return $reader;
+ }
+
/**
* Import a feed from a string
*
@@ -494,9 +527,9 @@ class Reader
/**
* Set plugin manager for use with Extensions
*
- * @param ExtensionManager $extensionManager
+ * @param ExtensionManagerInterface $extensionManager
*/
- public static function setExtensionManager(ExtensionManager $extensionManager)
+ public static function setExtensionManager(ExtensionManagerInterface $extensionManager)
{
static::$extensionManager = $extensionManager;
}
@@ -504,7 +537,7 @@ class Reader
/**
* Get plugin manager for use with Extensions
*
- * @return ExtensionManager
+ * @return ExtensionManagerInterface
*/
public static function getExtensionManager()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php b/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2403c5b75ac17446c0f11b412ca1586cad9048b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed;
+
+class Uri
+{
+ /**
+ * @var string
+ */
+ protected $fragment;
+
+ /**
+ * @var string
+ */
+ protected $host;
+
+ /**
+ * @var string
+ */
+ protected $pass;
+
+ /**
+ * @var string
+ */
+ protected $path;
+
+ /**
+ * @var int
+ */
+ protected $port;
+
+ /**
+ * @var string
+ */
+ protected $query;
+
+ /**
+ * @var string
+ */
+ protected $scheme;
+
+ /**
+ * @var string
+ */
+ protected $user;
+
+ /**
+ * @var bool
+ */
+ protected $valid;
+
+ /**
+ * Valid schemes
+ */
+ protected $validSchemes = array(
+ 'http',
+ 'https',
+ 'file',
+ );
+
+ /**
+ * @param string $uri
+ */
+ public function __construct($uri)
+ {
+ $parsed = parse_url($uri);
+ if (false === $parsed) {
+ $this->valid = false;
+ return;
+ }
+
+ $this->scheme = isset($parsed['scheme']) ? $parsed['scheme'] : null;
+ $this->host = isset($parsed['host']) ? $parsed['host'] : null;
+ $this->port = isset($parsed['port']) ? $parsed['port'] : null;
+ $this->user = isset($parsed['user']) ? $parsed['user'] : null;
+ $this->pass = isset($parsed['pass']) ? $parsed['pass'] : null;
+ $this->path = isset($parsed['path']) ? $parsed['path'] : null;
+ $this->query = isset($parsed['query']) ? $parsed['query'] : null;
+ $this->fragment = isset($parsed['fragment']) ? $parsed['fragment'] : null;
+ }
+
+ /**
+ * Create an instance
+ *
+ * Useful for chained validations
+ *
+ * @param string $uri
+ * @return self
+ */
+ public static function factory($uri)
+ {
+ return new static($uri);
+ }
+
+ /**
+ * Retrieve the host
+ *
+ * @return string
+ */
+ public function getHost()
+ {
+ return $this->host;
+ }
+
+ /**
+ * Retrieve the URI path
+ *
+ * @return string
+ */
+ public function getPath()
+ {
+ return $this->path;
+ }
+
+ /**
+ * Retrieve the scheme
+ *
+ * @return string
+ */
+ public function getScheme()
+ {
+ return $this->scheme;
+ }
+
+ /**
+ * Is the URI valid?
+ *
+ * @return bool
+ */
+ public function isValid()
+ {
+ if (false === $this->valid) {
+ return false;
+ }
+
+ if ($this->scheme && !in_array($this->scheme, $this->validSchemes)) {
+ return false;
+ }
+
+ if ($this->host) {
+ if ($this->path && substr($this->path, 0, 1) != '/') {
+ return false;
+ }
+ return true;
+ }
+
+ // no host, but user and/or port... what?
+ if ($this->user || $this->port) {
+ return false;
+ }
+
+ if ($this->path) {
+ // Check path-only (no host) URI
+ if (substr($this->path, 0, 2) == '//') {
+ return false;
+ }
+ return true;
+ }
+
+ if (! ($this->query || $this->fragment)) {
+ // No host, path, query or fragment - this is not a valid URI
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Is the URI absolute?
+ *
+ * @return bool
+ */
+ public function isAbsolute()
+ {
+ return ($this->scheme !== null);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
index 0a86fdfa728359d53ddebf29dc900a7236df6943..465ee9c15e06cc61e84b95a6b72aa5d775331fdc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
@@ -10,7 +10,7 @@
namespace Zend\Feed\Writer;
use DateTime;
-use Zend\Uri;
+use Zend\Feed\Uri;
use Zend\Validator;
class AbstractFeed
@@ -77,7 +77,7 @@ class AbstractFeed
}
if (isset($author['uri'])) {
if (empty($author['uri']) || !is_string($author['uri']) ||
- !Uri\UriFactory::factory($author['uri'])->isValid()
+ !Uri::factory($author['uri'])->isValid()
) {
throw new Exception\InvalidArgumentException(
'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
@@ -125,7 +125,7 @@ class AbstractFeed
/**
* Set the feed creation date
*
- * @param null|integer|DateTime
+ * @param null|int|DateTime
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
@@ -147,7 +147,7 @@ class AbstractFeed
/**
* Set the feed modification date
*
- * @param null|integer|DateTime
+ * @param null|int|DateTime
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
@@ -169,7 +169,7 @@ class AbstractFeed
/**
* Set the feed last-build date. Ignored for Atom 1.0.
*
- * @param null|integer|DateTime
+ * @param null|int|DateTime
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
@@ -229,7 +229,7 @@ class AbstractFeed
$generator['version'] = $data['version'];
}
if (isset($data['uri'])) {
- if (empty($data['uri']) || !is_string($data['uri']) || !Uri\UriFactory::factory($data['uri'])->isValid()) {
+ if (empty($data['uri']) || !is_string($data['uri']) || !Uri::factory($data['uri'])->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI');
}
$generator['uri'] = $data['uri'];
@@ -246,7 +246,7 @@ class AbstractFeed
$generator['version'] = $version;
}
if (isset($uri)) {
- if (empty($uri) || !is_string($uri) || !Uri\UriFactory::factory($uri)->isValid()) {
+ if (empty($uri) || !is_string($uri) || !Uri::factory($uri)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI');
}
$generator['uri'] = $uri;
@@ -266,7 +266,7 @@ class AbstractFeed
*/
public function setId($id)
{
- if ((empty($id) || !is_string($id) || !Uri\UriFactory::factory($id)->isValid())
+ if ((empty($id) || !is_string($id) || !Uri::factory($id)->isValid())
&& !preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $id)
&& !$this->_validateTagUri($id)
) {
@@ -322,7 +322,7 @@ class AbstractFeed
public function setImage(array $data)
{
if (empty($data['uri']) || !is_string($data['uri'])
- || !Uri\UriFactory::factory($data['uri'])->isValid()
+ || !Uri::factory($data['uri'])->isValid()
) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter \'uri\''
. ' must be a non-empty string and valid URI/IRI');
@@ -358,7 +358,7 @@ class AbstractFeed
*/
public function setLink($link)
{
- if (empty($link) || !is_string($link) || !Uri\UriFactory::factory($link)->isValid()) {
+ if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
}
$this->data['link'] = $link;
@@ -376,7 +376,7 @@ class AbstractFeed
*/
public function setFeedLink($link, $type)
{
- if (empty($link) || !is_string($link) || !Uri\UriFactory::factory($link)->isValid()) {
+ if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "link"" must be a non-empty string and valid URI/IRI');
}
if (!in_array(strtolower($type), array('rss', 'rdf', 'atom'))) {
@@ -430,7 +430,7 @@ class AbstractFeed
*/
public function setBaseUrl($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
. ' must be a non-empty string and valid URI/IRI');
}
@@ -448,7 +448,7 @@ class AbstractFeed
*/
public function addHub($url)
{
- if (empty($url) || !is_string($url) || !Uri\UriFactory::factory($url)->isValid()) {
+ if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
. ' must be a non-empty string and valid URI/IRI');
}
@@ -492,7 +492,7 @@ class AbstractFeed
if (isset($category['scheme'])) {
if (empty($category['scheme'])
|| !is_string($category['scheme'])
- || !Uri\UriFactory::factory($category['scheme'])->isValid()
+ || !Uri::factory($category['scheme'])->isValid()
) {
throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
. ' a category must be a valid URI');
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php
index 9c5ff24f95b9807495ae613291adef53ac606e6c..b9ff321210da79bd76f4f87c569a18882e793d61 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php
@@ -10,7 +10,7 @@
namespace Zend\Feed\Writer;
use DateTime;
-use Zend\Uri;
+use Zend\Feed\Uri;
/**
*/
@@ -191,7 +191,7 @@ class Deleted
if (isset($by['uri'])) {
if (empty($by['uri'])
|| !is_string($by['uri'])
- || !Uri\UriFactory::factory($by['uri'])->isValid()
+ || !Uri::factory($by['uri'])->isValid()
) {
throw new Exception\InvalidArgumentException('Invalid parameter: "uri" array value must'
. ' be a non-empty string and valid URI/IRI');
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
index ea62bddfa38efc293804f8a1e9c11f04927c7a05..219dd43889bd0f554371808966ef9351b146e468 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
@@ -10,8 +10,8 @@
namespace Zend\Feed\Writer;
use DateTime;
+use Zend\Feed\Uri;
use Zend\Feed\Writer\Exception;
-use Zend\Uri;
/**
*/
@@ -82,7 +82,7 @@ class Entry
}
if (isset($author['uri'])) {
if (empty($author['uri']) || !is_string($author['uri']) ||
- !Uri\UriFactory::factory($author['uri'])->isValid()
+ !Uri::factory($author['uri'])->isValid()
) {
throw new Exception\InvalidArgumentException(
'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
@@ -177,7 +177,7 @@ class Entry
/**
* Set the feed creation date
*
- * @param null|integer|DateTime $date
+ * @param null|int|DateTime $date
* @throws Exception\InvalidArgumentException
* @return Entry
*/
@@ -198,7 +198,7 @@ class Entry
/**
* Set the feed modification date
*
- * @param null|integer|DateTime $date
+ * @param null|int|DateTime $date
* @throws Exception\InvalidArgumentException
* @return Entry
*/
@@ -259,7 +259,7 @@ class Entry
*/
public function setLink($link)
{
- if (empty($link) || !is_string($link) || !Uri\UriFactory::factory($link)->isValid()) {
+ if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
}
$this->data['link'] = $link;
@@ -293,7 +293,7 @@ class Entry
*/
public function setCommentLink($link)
{
- if (empty($link) || !is_string($link) || !Uri\UriFactory::factory($link)->isValid()) {
+ if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
}
$this->data['commentLink'] = $link;
@@ -310,7 +310,7 @@ class Entry
*/
public function setCommentFeedLink(array $link)
{
- if (!isset($link['uri']) || !is_string($link['uri']) || !Uri\UriFactory::factory($link['uri'])->isValid()) {
+ if (!isset($link['uri']) || !is_string($link['uri']) || !Uri::factory($link['uri'])->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
}
if (!isset($link['type']) || !in_array($link['type'], array('atom', 'rss', 'rdf'))) {
@@ -493,7 +493,7 @@ class Entry
/**
* Get the number of comments/replies for current entry
*
- * @return integer
+ * @return int
*/
public function getCommentCount()
{
@@ -547,7 +547,7 @@ class Entry
if (isset($category['scheme'])) {
if (empty($category['scheme'])
|| !is_string($category['scheme'])
- || !Uri\UriFactory::factory($category['scheme'])->isValid()
+ || !Uri::factory($category['scheme'])->isValid()
) {
throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
. ' a category must be a valid URI');
@@ -604,7 +604,7 @@ class Entry
if (!isset($enclosure['uri'])) {
throw new Exception\InvalidArgumentException('Enclosure "uri" is not set');
}
- if (!Uri\UriFactory::factory($enclosure['uri'])->isValid()) {
+ if (!Uri::factory($enclosure['uri'])->isValid()) {
throw new Exception\InvalidArgumentException('Enclosure "uri" is not a valid URI/IRI');
}
$this->data['enclosure'] = $enclosure;
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
index f5b3982ca93e9151883679f31415bb2ffd59cf2c..f136293e87381e815f051765b934a2b5bd2a2985 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
@@ -152,7 +152,7 @@ class Entry
*/
public function setItunesExplicit($value)
{
- if (!in_array($value, array('yes','no','clean'))) {
+ if (!in_array($value, array('yes', 'no', 'clean'))) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
. ' be one of "yes", "no" or "clean"');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
index 7444d3a48ca7369383ffa7e842446add32632197..7e6c5ac55e461928b3c45fd8f5246f1342ac3a6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
@@ -9,8 +9,8 @@
namespace Zend\Feed\Writer\Extension\ITunes;
+use Zend\Feed\Uri;
use Zend\Feed\Writer;
-use Zend\Uri;
use Zend\Stdlib\StringUtils;
use Zend\Stdlib\StringWrapper\StringWrapperInterface;
@@ -137,7 +137,7 @@ class Feed
if (!isset($this->data['categories'])) {
$this->data['categories'] = array();
}
- foreach ($values as $key=>$value) {
+ foreach ($values as $key => $value) {
if (!is_array($value)) {
if ($this->stringWrapper->strlen($value) > 255) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
@@ -171,11 +171,11 @@ class Feed
*/
public function setItunesImage($value)
{
- if (!Uri\UriFactory::factory($value)->isValid()) {
+ if (!Uri::factory($value)->isValid()) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
. ' be a valid URI/IRI');
}
- if (!in_array(substr($value, -3), array('jpg','png'))) {
+ if (!in_array(substr($value, -3), array('jpg', 'png'))) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
. ' use file extension "jpg" or "png" which must be the last three'
. ' characters of the URI (i.e. no query string or fragment)');
@@ -214,7 +214,7 @@ class Feed
*/
public function setItunesExplicit($value)
{
- if (!in_array($value, array('yes','no','clean'))) {
+ if (!in_array($value, array('yes', 'no', 'clean'))) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
. ' be one of "yes", "no" or "clean"');
}
@@ -254,7 +254,7 @@ class Feed
*/
public function setItunesNewFeedUrl($value)
{
- if (!Uri\UriFactory::factory($value)->isValid()) {
+ if (!Uri::factory($value)->isValid()) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "newFeedUrl" may only'
. ' be a valid URI/IRI');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
index b27da627db05fa5ade383f73a7f5941c03eb1fc2..9799681a0c3f99c1b65e1c41a67e30443ebf7fb6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
@@ -116,7 +116,7 @@ class Feed extends Extension\AbstractRenderer
if (!$cats || empty($cats)) {
return;
}
- foreach ($cats as $key=>$cat) {
+ foreach ($cats as $key => $cat) {
if (!is_array($cat)) {
$el = $dom->createElement('itunes:category');
$el->setAttribute('text', $cat);
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php
index c0d4b4b4c3263da4c27f35d71a2f6c8ade66b538..0bb4ce0ff03c660abb35a60b376bdf296a0bf40b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php
@@ -9,72 +9,72 @@
namespace Zend\Feed\Writer;
-use Zend\ServiceManager\AbstractPluginManager;
-
/**
- * Plugin manager implementation for feed writer extensions
+ * Default implementation of ExtensionManagerInterface
*
- * Validation checks that we have an Entry, Feed, or Extension\AbstractRenderer.
+ * Decorator of ExtensionPluginManager.
*/
-class ExtensionManager extends AbstractPluginManager
+class ExtensionManager implements ExtensionManagerInterface
{
- /**
- * Default set of extension classes
- *
- * @var array
- */
- protected $invokableClasses = array(
- 'atomrendererfeed' => 'Zend\Feed\Writer\Extension\Atom\Renderer\Feed',
- 'contentrendererentry' => 'Zend\Feed\Writer\Extension\Content\Renderer\Entry',
- 'dublincorerendererentry' => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry',
- 'dublincorerendererfeed' => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed',
- 'itunesentry' => 'Zend\Feed\Writer\Extension\ITunes\Entry',
- 'itunesfeed' => 'Zend\Feed\Writer\Extension\ITunes\Feed',
- 'itunesrendererentry' => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Entry',
- 'itunesrendererfeed' => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Feed',
- 'slashrendererentry' => 'Zend\Feed\Writer\Extension\Slash\Renderer\Entry',
- 'threadingrendererentry' => 'Zend\Feed\Writer\Extension\Threading\Renderer\Entry',
- 'wellformedwebrendererentry' => 'Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry',
- );
+ protected $pluginManager;
/**
- * Do not share instances
+ * Constructor
+ *
+ * Seeds the extension manager with a plugin manager; if none provided,
+ * creates an instance.
*
- * @var bool
+ * @param null|ExtensionPluginManager $pluginManager
*/
- protected $shareByDefault = false;
+ public function __construct(ExtensionPluginManager $pluginManager = null)
+ {
+ if (null === $pluginManager) {
+ $pluginManager = new ExtensionPluginManager();
+ }
+ $this->pluginManager = $pluginManager;
+ }
/**
- * Validate the plugin
+ * Method overloading
*
- * Checks that the extension loaded is of a valid type.
+ * Proxy to composed ExtensionPluginManager instance.
*
- * @param mixed $plugin
- * @return void
- * @throws Exception\InvalidArgumentException if invalid
+ * @param string $method
+ * @param array $args
+ * @return mixed
+ * @throws Exception\BadMethodCallException
*/
- public function validatePlugin($plugin)
+ public function __call($method, $args)
{
- if ($plugin instanceof Extension\AbstractRenderer) {
- // we're okay
- return;
- }
-
- if ('Feed' == substr(get_class($plugin), -4)) {
- // we're okay
- return;
+ if (!method_exists($this->pluginManager, $method)) {
+ throw new Exception\BadMethodCallException(sprintf(
+ 'Method by name of %s does not exist in %s',
+ $method,
+ __CLASS__
+ ));
}
+ return call_user_func_array(array($this->pluginManager, $method), $args);
+ }
- if ('Entry' == substr(get_class($plugin), -5)) {
- // we're okay
- return;
- }
+ /**
+ * Get the named extension
+ *
+ * @param string $name
+ * @return Extension\AbstractEntry|Extension\AbstractFeed
+ */
+ public function get($name)
+ {
+ return $this->pluginManager->get($name);
+ }
- throw new Exception\InvalidArgumentException(sprintf(
- 'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface '
- . 'or the classname must end in "Feed" or "Entry"',
- (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
- __NAMESPACE__
- ));
+ /**
+ * Do we have the named extension?
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function has($name)
+ {
+ return $this->pluginManager->has($name);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..358e187a86ad6c780fcb140ad47df33f4dfda119
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Writer;
+
+interface ExtensionManagerInterface
+{
+ /**
+ * Do we have the extension?
+ *
+ * @param string $extension
+ * @return bool
+ */
+ public function has($extension);
+
+ /**
+ * Retrieve the extension
+ *
+ * @param string $extension
+ * @return mixed
+ */
+ public function get($extension);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionPluginManager.php
new file mode 100644
index 0000000000000000000000000000000000000000..575794eb3f5bb3bf02ab90f206b4ef76242324d7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionPluginManager.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Writer;
+
+use Zend\ServiceManager\AbstractPluginManager;
+
+/**
+ * Plugin manager implementation for feed writer extensions
+ *
+ * Validation checks that we have an Entry, Feed, or Extension\AbstractRenderer.
+ */
+class ExtensionPluginManager extends AbstractPluginManager
+{
+ /**
+ * Default set of extension classes
+ *
+ * @var array
+ */
+ protected $invokableClasses = array(
+ 'atomrendererfeed' => 'Zend\Feed\Writer\Extension\Atom\Renderer\Feed',
+ 'contentrendererentry' => 'Zend\Feed\Writer\Extension\Content\Renderer\Entry',
+ 'dublincorerendererentry' => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry',
+ 'dublincorerendererfeed' => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed',
+ 'itunesentry' => 'Zend\Feed\Writer\Extension\ITunes\Entry',
+ 'itunesfeed' => 'Zend\Feed\Writer\Extension\ITunes\Feed',
+ 'itunesrendererentry' => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Entry',
+ 'itunesrendererfeed' => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Feed',
+ 'slashrendererentry' => 'Zend\Feed\Writer\Extension\Slash\Renderer\Entry',
+ 'threadingrendererentry' => 'Zend\Feed\Writer\Extension\Threading\Renderer\Entry',
+ 'wellformedwebrendererentry' => 'Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry',
+ );
+
+ /**
+ * Do not share instances
+ *
+ * @var bool
+ */
+ protected $shareByDefault = false;
+
+ /**
+ * Validate the plugin
+ *
+ * Checks that the extension loaded is of a valid type.
+ *
+ * @param mixed $plugin
+ * @return void
+ * @throws Exception\InvalidArgumentException if invalid
+ */
+ public function validatePlugin($plugin)
+ {
+ if ($plugin instanceof Extension\AbstractRenderer) {
+ // we're okay
+ return;
+ }
+
+ if ('Feed' == substr(get_class($plugin), -4)) {
+ // we're okay
+ return;
+ }
+
+ if ('Entry' == substr(get_class($plugin), -5)) {
+ // we're okay
+ return;
+ }
+
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface '
+ . 'or the classname must end in "Feed" or "Entry"',
+ (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+ __NAMESPACE__
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php
index c883b267cedb1002edcd4d3104fd5df749ee3812..0922082c66cca6b8d6818e63da7609f50ae1c0aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php
@@ -148,7 +148,7 @@ class Feed extends AbstractFeed implements Iterator, Countable
}
$entries[$timestamp] = $entry;
}
- krsort($entries, \SORT_NUMERIC);
+ krsort($entries, SORT_NUMERIC);
$this->entries = array_values($entries);
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
index b109878d59b963faa61fccf3ea2af44ba29b3af8..1758f4ff68e7860f999c697cb2e85ec0f5f41ff8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
@@ -12,9 +12,9 @@ namespace Zend\Feed\Writer\Renderer\Entry;
use DateTime;
use DOMDocument;
use DOMElement;
+use Zend\Feed\Uri;
use Zend\Feed\Writer;
use Zend\Feed\Writer\Renderer;
-use Zend\Uri;
use Zend\Validator;
class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterface
@@ -267,7 +267,7 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
$this->getDataContainer()->setId(
$this->getDataContainer()->getLink());
}
- if (!Uri\UriFactory::factory($this->getDataContainer()->getId())->isValid()
+ if (!Uri::factory($this->getDataContainer()->getId())->isValid()
&& !preg_match(
"#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#",
$this->getDataContainer()->getId())
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
index 6b34bffff9d3248d77e4eb792e5523225f141480..8d352c9c190edacbbfd07514b7164d8eab63e61e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
@@ -12,9 +12,9 @@ namespace Zend\Feed\Writer\Renderer\Entry;
use DateTime;
use DOMDocument;
use DOMElement;
+use Zend\Feed\Uri;
use Zend\Feed\Writer;
use Zend\Feed\Writer\Renderer;
-use Zend\Uri;
/**
*/
@@ -279,7 +279,7 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
}
$text = $dom->createTextNode($this->getDataContainer()->getId());
$id->appendChild($text);
- if (!Uri\UriFactory::factory($this->getDataContainer()->getId())->isValid()) {
+ if (!Uri::factory($this->getDataContainer()->getId())->isValid()) {
$id->setAttribute('isPermaLink', 'false');
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
index 5afbef6431a1126df786d552eaa22a6018d439cd..2ff11129ac49849dafd8d4691aab8f09906b7044 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
@@ -14,7 +14,7 @@ use DOMDocument;
use DOMElement;
use Zend\Feed\Writer;
use Zend\Feed\Writer\Renderer;
-use Zend\Version\Version;
+use Zend\Feed\Writer\Version;
/**
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
index 413ca3375a2ca97ddbcdcc673675f6a1dd36b8b9..a36dab28eaf3ce2734d76e1cc5cfabd7b1f11a16 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -13,7 +13,7 @@ use Datetime;
use DOMDocument;
use DOMElement;
use Zend\Feed;
-use Zend\Version\Version;
+use Zend\Feed\Writer\Version;
class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
index 7b25c34aa0ada3b8a3a2026fcbb0e8034af03f72..84056a92286c5436a9b27145ff5409701e73b068 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
@@ -12,10 +12,10 @@ namespace Zend\Feed\Writer\Renderer\Feed;
use DateTime;
use DOMDocument;
use DOMElement;
+use Zend\Feed\Uri;
use Zend\Feed\Writer;
use Zend\Feed\Writer\Renderer;
-use Zend\Uri;
-use Zend\Version\Version;
+use Zend\Feed\Writer\Version;
/**
*/
@@ -239,7 +239,7 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
$root->appendChild($link);
$text = $dom->createTextNode($value);
$link->appendChild($text);
- if (!Uri\UriFactory::factory($value)->isValid()) {
+ if (!Uri::factory($value)->isValid()) {
$link->setAttribute('isPermaLink', 'false');
}
}
@@ -317,7 +317,7 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
}
if (empty($image['link']) || !is_string($image['link'])
- || !Uri\UriFactory::factory($image['link'])->isValid()
+ || !Uri::factory($image['link'])->isValid()
) {
$message = 'Invalid parameter: parameter \'link\''
. ' must be a non-empty string and valid URI/IRI';
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Version.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Version.php
new file mode 100644
index 0000000000000000000000000000000000000000..806d5906d4cb0a0a45322ce1407bd683a973e9a9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Version.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Writer;
+
+abstract class Version
+{
+ const VERSION = '2';
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php
index 36a876d3cab163e32985185e2af281ce07d712d1..ccd69d4d01d70e3c957b6a058e5b24f851c5ae2c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php
@@ -41,7 +41,7 @@ class Writer
const TYPE_RSS_ANY = 'rss';
/**
- * @var ExtensionManager
+ * @var ExtensionManagerInterface
*/
protected static $extensionManager = null;
@@ -62,9 +62,9 @@ class Writer
/**
* Set plugin loader for use with Extensions
*
- * @param ExtensionManager
+ * @param ExtensionManagerInterface
*/
- public static function setExtensionManager(ExtensionManager $extensionManager)
+ public static function setExtensionManager(ExtensionManagerInterface $extensionManager)
{
static::$extensionManager = $extensionManager;
}
@@ -72,7 +72,7 @@ class Writer
/**
* Get plugin manager for use with Extensions
*
- * @return ExtensionManager
+ * @return ExtensionManagerInterface
*/
public static function getExtensionManager()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/composer.json b/vendor/zendframework/zendframework/library/Zend/Feed/composer.json
index 4dabb6b97b236a6b24d33b7b5460b6cab212803c..d55068f011fd990e370dbceb6b939e3168a3fc20 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/composer.json
@@ -15,18 +15,17 @@
"require": {
"php": ">=5.3.3",
"zendframework/zend-escaper": "self.version",
- "zendframework/zend-stdlib": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-uri": "self.version",
- "zendframework/zend-version": "self.version"
+ "zendframework/zend-stdlib": "self.version"
},
"suggest": {
+ "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
"zendframework/zend-validator": "Zend\\Validator component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
index 53bfa0dfc4c58cf8bbda221feb39b49ae4d3e0ea..0bec4da1a8366eccde2098ab8152b2e13d5fe57b 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
@@ -1258,7 +1258,7 @@ abstract class AbstractAdapter implements TranslatorAwareInterface
/**
* Returns the formatted size
*
- * @param integer $size
+ * @param int $size
* @return string
*/
protected static function toByteString($size)
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
index 0f2107ae14eb1a0ebe4d59f7b1245cb066025c9f..5229da355bab21e40fab2a5c7a7e90ceb46ecb5b 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
@@ -26,10 +26,10 @@ class FilterPluginManager extends BaseManager
* @var array
*/
protected $aliases = array(
- 'decrypt' =>'filedecrypt',
- 'encrypt' =>'fileencrypt',
- 'lowercase' =>'filelowercase',
- 'rename' =>'filerename',
- 'uppercase' =>'fileuppercase',
+ 'decrypt' => 'filedecrypt',
+ 'encrypt' => 'fileencrypt',
+ 'lowercase' => 'filelowercase',
+ 'rename' => 'filerename',
+ 'uppercase' => 'fileuppercase',
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
index 22fe78ca3b2912ce4f7fc2be9b5072254e2eb181..e5a3617bfdbfa74eec540cdf04b56f5329eba2da 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
@@ -14,23 +14,23 @@ use Zend\Validator\ValidatorPluginManager as BaseManager;
class ValidatorPluginManager extends BaseManager
{
protected $aliases = array(
- 'count' =>'filecount',
- 'crc32' =>'filecrc32',
- 'excludeextension' =>'fileexcludeextension',
- 'excludemimetype' =>'fileexcludemimetype',
- 'exists' =>'fileexists',
- 'extension' =>'fileextension',
- 'filessize' =>'filefilessize',
- 'hash' =>'filehash',
- 'imagesize' =>'fileimagesize',
- 'iscompressed' =>'fileiscompressed',
- 'isimage' =>'fileisimage',
- 'md5' =>'filemd5',
- 'mimetype' =>'filemimetype',
- 'notexists' =>'filenotexists',
- 'sha1' =>'filesha1',
- 'size' =>'filesize',
- 'upload' =>'fileupload',
- 'wordcount' =>'filewordcount',
+ 'count' => 'filecount',
+ 'crc32' => 'filecrc32',
+ 'excludeextension' => 'fileexcludeextension',
+ 'excludemimetype' => 'fileexcludemimetype',
+ 'exists' => 'fileexists',
+ 'extension' => 'fileextension',
+ 'filessize' => 'filefilessize',
+ 'hash' => 'filehash',
+ 'imagesize' => 'fileimagesize',
+ 'iscompressed' => 'fileiscompressed',
+ 'isimage' => 'fileisimage',
+ 'md5' => 'filemd5',
+ 'mimetype' => 'filemimetype',
+ 'notexists' => 'filenotexists',
+ 'sha1' => 'filesha1',
+ 'size' => 'filesize',
+ 'upload' => 'fileupload',
+ 'wordcount' => 'filewordcount',
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php
index 92bf86d2ec0af1fb74f4a7a2d893957b2ee0b98a..d480d49c8c773c3d144ad54e8618d12197ab19f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php
@@ -54,7 +54,7 @@ class Transfer
$adapter = '\Zend\File\Transfer\Adapter\\' . ucfirst($adapter);
}
- $direction = (integer) $direction;
+ $direction = (int) $direction;
$this->adapter[$direction] = new $adapter($options);
if (!$this->adapter[$direction] instanceof Adapter\AbstractAdapter) {
throw new Exception\InvalidArgumentException(
@@ -79,7 +79,7 @@ class Transfer
return $this->adapter;
}
- $direction = (integer) $direction;
+ $direction = (int) $direction;
return $this->adapter[$direction];
}
@@ -94,7 +94,7 @@ class Transfer
public function __call($method, array $options)
{
if (array_key_exists('direction', $options)) {
- $direction = (integer) $options['direction'];
+ $direction = (int) $options['direction'];
} else {
$direction = 0;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/composer.json b/vendor/zendframework/zendframework/library/Zend/File/composer.json
index ffa232e3972d2ac1654aa2cd370deb13e2f05a5f..c32a985a6da9bc29b2dfb36944406db575f7727a 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/File/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php b/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
index 930a12fef7d02339a06f284f0ea359a5132da5db..38f22298866e04d658ef78130086a804a65e045c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
@@ -88,9 +88,9 @@ class Boolean extends AbstractFilter
/**
* Set boolean types
*
- * @param integer|array $type
+ * @param int|array $type
* @throws Exception\InvalidArgumentException
- * @return Boolean
+ * @return bool
*/
public function setType($type = null)
{
@@ -137,7 +137,7 @@ class Boolean extends AbstractFilter
* @param bool $flag When true this filter works like cast
* When false it recognises only true and false
* and all other values are returned as is
- * @return Boolean
+ * @return bool
*/
public function setCasting($flag = true)
{
@@ -158,7 +158,7 @@ class Boolean extends AbstractFilter
/**
* @param array|Traversable $translations
* @throws Exception\InvalidArgumentException
- * @return Boolean
+ * @return bool
*/
public function setTranslations($translations)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
index 019f4752a59f57f3abe91e027f6469611226bbf6..71a91839c2db2294521221d6b177e9d6d0b07617 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
@@ -47,7 +47,7 @@ class Bz2 extends AbstractCompressionAlgorithm
/**
* Returns the set blocksize
*
- * @return integer
+ * @return int
*/
public function getBlocksize()
{
@@ -57,7 +57,7 @@ class Bz2 extends AbstractCompressionAlgorithm
/**
* Sets a new blocksize
*
- * @param integer $blocksize
+ * @param int $blocksize
* @throws Exception\InvalidArgumentException
* @return Bz2
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
index 24cf81604d7c54b832bc1c81d0ab3d1e7de07a7e..02411731b66d3b819d354f08a80bb1893f61b61a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
@@ -49,7 +49,7 @@ class Gz extends AbstractCompressionAlgorithm
/**
* Returns the set compression level
*
- * @return integer
+ * @return int
*/
public function getLevel()
{
@@ -59,7 +59,7 @@ class Gz extends AbstractCompressionAlgorithm
/**
* Sets a new compression level
*
- * @param integer $level
+ * @param int $level
* @throws Exception\InvalidArgumentException
* @return Gz
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..690ae2f3584c5355aaf9584c1a92a5311305696e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Filter;
+
+use DateTime;
+
+class DateTimeFormatter extends AbstractFilter
+{
+ /**
+ * A valid format string accepted by date()
+ *
+ * @var string
+ */
+ protected $format = DateTime::ISO8601;
+
+ /**
+ * Sets filter options
+ *
+ * @param array|Traversable $options
+ */
+ public function __construct($options = null)
+ {
+ if ($options) {
+ $this->setOptions($options);
+ }
+ }
+
+ /**
+ * Set the format string accepted by date() to use when formatting a string
+ *
+ * @param string $format
+ * @return \Zend\Filter\DateTimeFormatter
+ */
+ public function setFormat($format)
+ {
+ $this->format = $format;
+ return $this;
+ }
+
+ /**
+ * Filter a datetime string by normalizing it to the filters specified format
+ *
+ * @param string $value
+ * @throws Exception\InvalidArgumentException
+ * @return string
+ */
+ public function filter($value)
+ {
+ try {
+ $result = $this->normalizeDateTime($value);
+ } catch (\Exception $e) {
+ // DateTime threw an exception, an invalid date string was provided
+ throw new Exception\InvalidArgumentException('Invalid date string provided', $e->getCode(), $e);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Normalize the provided value to a formatted string
+ *
+ * @param string|int|DateTime $value
+ * @returns string
+ */
+ protected function normalizeDateTime($value)
+ {
+ if ($value === '' || $value === null) {
+ return $value;
+ } elseif (is_int($value)) {
+ $dateTime = new DateTime('@' . $value);
+ } elseif (!$value instanceof DateTime) {
+ $dateTime = new DateTime($value);
+ }
+
+ return $dateTime->format($this->format);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
index 8e885fc3fc25f4708f939bcd654e728271b990c2..87f5639512664a6629434828bae2514249d5c42f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
@@ -225,7 +225,7 @@ class Rename extends Filter\AbstractFilter
break;
case 'randomize' :
- $files['randomize'] = (boolean) $value;
+ $files['randomize'] = (bool) $value;
break;
default:
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
index ce1772f6ee634c00e95b0780d97b63c33d9ea05f..a1451361315cfd3ed6eb9b2628d0e17b4144052e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
@@ -19,10 +19,11 @@ class RenameUpload extends AbstractFilter
* @var array
*/
protected $options = array(
- 'target' => null,
- 'use_upload_name' => false,
- 'overwrite' => false,
- 'randomize' => false,
+ 'target' => null,
+ 'use_upload_name' => false,
+ 'use_upload_extension' => false,
+ 'overwrite' => false,
+ 'randomize' => false,
);
/**
@@ -72,19 +73,19 @@ class RenameUpload extends AbstractFilter
}
/**
- * @param boolean $flag When true, this filter will use the $_FILES['name']
+ * @param bool $flag When true, this filter will use the $_FILES['name']
* as the target filename.
* Otherwise, it uses the default 'target' rules.
* @return RenameUpload
*/
public function setUseUploadName($flag = true)
{
- $this->options['use_upload_name'] = (boolean) $flag;
+ $this->options['use_upload_name'] = (bool) $flag;
return $this;
}
/**
- * @return boolean
+ * @return bool
*/
public function getUseUploadName()
{
@@ -92,17 +93,36 @@ class RenameUpload extends AbstractFilter
}
/**
- * @param boolean $flag Shall existing files be overwritten?
+ * @param bool $flag When true, this filter will use the original file
+ * extension for the target filename
+ * @return RenameUpload
+ */
+ public function setUseUploadExtension($flag = true)
+ {
+ $this->options['use_upload_extension'] = (bool) $flag;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function getUseUploadExtension()
+ {
+ return $this->options['use_upload_extension'];
+ }
+
+ /**
+ * @param bool $flag Shall existing files be overwritten?
* @return RenameUpload
*/
public function setOverwrite($flag = true)
{
- $this->options['overwrite'] = (boolean) $flag;
+ $this->options['overwrite'] = (bool) $flag;
return $this;
}
/**
- * @return boolean
+ * @return bool
*/
public function getOverwrite()
{
@@ -110,17 +130,17 @@ class RenameUpload extends AbstractFilter
}
/**
- * @param boolean $flag Shall target files have a random postfix attached?
+ * @param bool $flag Shall target files have a random postfix attached?
* @return RenameUpload
*/
public function setRandomize($flag = true)
{
- $this->options['randomize'] = (boolean) $flag;
+ $this->options['randomize'] = (bool) $flag;
return $this;
}
/**
- * @return boolean
+ * @return bool
*/
public function getRandomize()
{
@@ -179,7 +199,7 @@ class RenameUpload extends AbstractFilter
* @param string $sourceFile Source file path
* @param string $targetFile Target file path
* @throws \Zend\Filter\Exception\RuntimeException
- * @return boolean
+ * @return bool
*/
protected function moveUploadedFile($sourceFile, $targetFile)
{
@@ -242,12 +262,19 @@ class RenameUpload extends AbstractFilter
$targetFile = basename($uploadData['name']);
} elseif (!is_dir($target)) {
$targetFile = basename($target);
+ if ($this->getUseUploadExtension() && !$this->getRandomize()) {
+ $targetInfo = pathinfo($targetFile);
+ $sourceinfo = pathinfo($uploadData['name']);
+ if (isset($sourceinfo['extension'])) {
+ $targetFile = $targetInfo['filename'] . '.' . $sourceinfo['extension'];
+ }
+ }
} else {
$targetFile = basename($source);
}
if ($this->getRandomize()) {
- $targetFile = $this->applyRandomToFilename($targetFile);
+ $targetFile = $this->applyRandomToFilename($uploadData['name'], $targetFile);
}
return $targetDir . $targetFile;
@@ -257,13 +284,20 @@ class RenameUpload extends AbstractFilter
* @param string $filename
* @return string
*/
- protected function applyRandomToFilename($filename)
+ protected function applyRandomToFilename($source, $filename)
{
$info = pathinfo($filename);
$filename = $info['filename'] . uniqid('_');
- if (isset($info['extension'])) {
- $filename .= '.' . $info['extension'];
+
+ $sourceinfo = pathinfo($source);
+
+ $extension = '';
+ if ($this->getUseUploadExtension() === true && isset($sourceinfo['extension'])) {
+ $extension .= '.' . $sourceinfo['extension'];
+ } elseif (isset($info['extension'])) {
+ $extension .= '.' . $info['extension'];
}
- return $filename;
+
+ return $filename . $extension;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php b/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
index 40534fab77ab60e918173e800ef4fb2a844ec284..2cbce4b0ad2b28b4b6968943631e136b56ce6fcd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
@@ -17,7 +17,7 @@ class HtmlEntities extends AbstractFilter
/**
* Corresponds to the second htmlentities() argument
*
- * @var integer
+ * @var int
*/
protected $quoteStyle;
@@ -78,7 +78,7 @@ class HtmlEntities extends AbstractFilter
/**
* Returns the quoteStyle option
*
- * @return integer
+ * @return int
*/
public function getQuoteStyle()
{
@@ -88,7 +88,7 @@ class HtmlEntities extends AbstractFilter
/**
* Sets the quoteStyle option
*
- * @param integer $quoteStyle
+ * @param int $quoteStyle
* @return HtmlEntities Provides a fluent interface
*/
public function setQuoteStyle($quoteStyle)
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php b/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
index 2db134ffb3657a4d935addd32893f2df09de6ec6..0804569061fbec9ca90e8fabe0df6d27a7773a58 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
@@ -248,8 +248,8 @@ class Inflector extends AbstractFilter
*
* ex:
* array(
- * ':controller' => array('CamelCaseToUnderscore','StringToLower'),
- * ':action' => array('CamelCaseToUnderscore','StringToLower'),
+ * ':controller' => array('CamelCaseToUnderscore', 'StringToLower'),
+ * ':action' => array('CamelCaseToUnderscore', 'StringToLower'),
* 'suffix' => 'phtml'
* );
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Int.php b/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
index 3adc56b31297dcfe507bbbc39e24664537ba4ec1..47b912d7f9f0e042478581ab56088e45a52d0391 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
@@ -17,7 +17,7 @@ class Int extends AbstractFilter
* Returns (int) $value
*
* @param string $value
- * @return integer
+ * @return int
*/
public function filter($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Null.php b/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
index 43873c4b637860a5811378d0fed1c07d0d698a6a..2f7ecca12f84b6fd7e7190458a00cabbcff0aaaa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
@@ -68,9 +68,9 @@ class Null extends AbstractFilter
/**
* Set boolean types
*
- * @param integer|array $type
+ * @param int|array $type
* @throws Exception\InvalidArgumentException
- * @return Boolean
+ * @return bool
*/
public function setType($type = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
index 8ba185c4c4e4590bbe718785ec64426eac16ab56..67dd6852dbc29dd2c317cf93357819d480f8a381 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
@@ -11,9 +11,9 @@ namespace Zend\Filter;
use Zend\Filter\AbstractFilter;
use Zend\Filter\Exception\InvalidArgumentException;
+use Zend\Uri\Exception\ExceptionInterface as UriException;
use Zend\Uri\UriFactory;
use Zend\Uri\Uri;
-use Zend\Uri\Exception\ExceptionInterface as UriException;
class UriNormalize extends AbstractFilter
{
@@ -34,8 +34,7 @@ class UriNormalize extends AbstractFilter
/**
* Sets filter options
*
- * @param array|\Traversable|null $options
- * @return void
+ * @param array|\Traversable|null $options
*/
public function __construct($options = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
index 2d8bf6f4a8fcd307ee30f5e5801a5574d9959d1a..3ea8a7262feb7d7737173169c1c5c26fc7318fda 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
@@ -9,8 +9,8 @@
namespace Zend\Filter\Word;
-use Zend\Filter\Exception;
use Zend\Filter\AbstractFilter;
+use Zend\Filter\Exception;
abstract class AbstractSeparator extends AbstractFilter
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/composer.json b/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
index 646cd51cd74c00f5390618dbe8bc30d0b83a6985..a069522019fc2d866c4f800920027f3536c8466a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
@@ -28,8 +28,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
index 663ae6531313d420ea2c3928d04341b9e89e1d9d..d45d59c341fb70e37779f73f2b40f78041e0b19f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
@@ -10,6 +10,7 @@
namespace Zend\Form\Annotation;
use ReflectionClass;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
@@ -23,28 +24,8 @@ use Zend\EventManager\ListenerAggregateInterface;
* discovered via reflection, if no other annotation has provided the name
* already.
*/
-abstract class AbstractAnnotationsListener implements ListenerAggregateInterface
+abstract class AbstractAnnotationsListener extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
- /**
- * Detach listeners
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if (false !== $events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Attempt to discover a name set via annotation
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
index c6524bedf3a6c2c0727c5f7fd80fb43ce9c69d12..532c4fd1cd244f7a09ca6189a7d62ef5192a0f29 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
@@ -318,7 +318,14 @@ class AnnotationBuilder implements EventManagerAwareInterface, FormFactoryAwareI
$events->trigger(__FUNCTION__, $this, $event);
}
- $filterSpec[$name] = $event->getParam('inputSpec');
+ // Since "type" is a reserved name in the filter specification,
+ // we need to add the specification without the name as the key.
+ // In all other cases, though, the name is fine.
+ if ($name === 'type') {
+ $filterSpec[] = $event->getParam('inputSpec');
+ } else {
+ $filterSpec[$name] = $event->getParam('inputSpec');
+ }
$elementSpec = $event->getParam('elementSpec');
$type = (isset($elementSpec['spec']['type']))
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
index df8fa91400b55e05bdfb8ecaf832e0ef4a6f5114..eca60019a35fe899adf3b36039a0ce4e71e6f1a9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
@@ -36,10 +36,7 @@ use Zend\EventManager\EventManagerInterface;
class ElementAnnotationsListener extends AbstractAnnotationsListener
{
/**
- * Attach listeners
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
index c1afb1600c23d398d1dea2f7b2f3a5e8291b8d43..5605ea784fb3f4a7f214af0044d27bee75783f88 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
@@ -10,10 +10,10 @@
namespace Zend\Form\Element;
use DateTime as PhpDateTime;
+use Zend\Form\Exception\InvalidArgumentException;
use Zend\Form\FormInterface;
use Zend\Validator\ValidatorInterface;
use Zend\Validator\Date as DateValidator;
-use Zend\Form\Exception\InvalidArgumentException;
use Exception;
class DateSelect extends MonthSelect
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php
index 50892c077281ae43f7912616fac990252cd70768..3705e2d3c68d8c1da476cbc4b378f3ad8ec9b83c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php
@@ -32,9 +32,7 @@ class DateTime extends Element implements InputProviderInterface
);
/**
- *
- * Opera and mobile browsers support datetime input, and display a datepicker control
- * But the submitted value does not include seconds.
+ * A valid format string accepted by date()
*
* @var string
*/
@@ -189,6 +187,12 @@ class DateTime extends Element implements InputProviderInterface
'required' => true,
'filters' => array(
array('name' => 'Zend\Filter\StringTrim'),
+ array(
+ 'name' => 'Zend\Filter\DateTimeFormatter',
+ 'options' => array(
+ 'format' => $this->getFormat(),
+ )
+ )
),
'validators' => $this->getValidators(),
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php
index 414fe749007df98c4f0f78abc24beadae42ddd22..c35fde8fb4470e8ac823eb477c0fcf4ebcd82165 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php
@@ -9,7 +9,6 @@
namespace Zend\Form\Element;
-use Zend\Form\Element;
use Zend\Validator\DateStep as DateStepValidator;
class DateTimeLocal extends DateTime
@@ -26,11 +25,7 @@ class DateTimeLocal extends DateTime
);
/**
- *
- * Opera and mobile browsers support datetime input, and display a datepicker control
- * But the submitted value does not include seconds.
- *
- * @var string
+ * {@inheritDoc}
*/
protected $format = self::DATETIME_LOCAL_FORMAT;
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php
index c2c16004f369945059943493084d21081a2eb1b6..43c47910d96d523c3a5bebf21e1575bb7ca1a0ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php
@@ -10,11 +10,11 @@
namespace Zend\Form\Element;
use DateTime as PhpDateTime;
+use Exception;
use Zend\Form\FormInterface;
+use Zend\Form\Exception\InvalidArgumentException;
use Zend\Validator\ValidatorInterface;
use Zend\Validator\Date as DateValidator;
-use Zend\Form\Exception\InvalidArgumentException;
-use Exception;
class DateTimeSelect extends DateSelect
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php
index 2d7164d5570440043173083faf8f643676f60348..3f818c8f14b7fbbd32d4c8e65c592de8dd31d4b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php
@@ -11,8 +11,8 @@ namespace Zend\Form\Element;
use Zend\Form\Element;
use Zend\InputFilter\InputProviderInterface;
-use Zend\Validator\Regex as RegexValidator;
use Zend\Validator\Explode as ExplodeValidator;
+use Zend\Validator\Regex as RegexValidator;
use Zend\Validator\ValidatorInterface;
class Email extends Element implements InputProviderInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
index b65c4cafebbbdeae41b069347bcada83ae00e7c8..bff2af42e59a42e13eb5fc0f864db9cde21b7ea2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
@@ -18,9 +18,9 @@
namespace Zend\Form\Element;
-use Zend\Form\FormInterface;
use Zend\Form\Element;
use Zend\Form\ElementPrepareAwareInterface;
+use Zend\Form\FormInterface;
use Zend\InputFilter\InputProviderInterface;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
index 6ab28de442e032675021611ca06648cf9bdb99d6..950678c522a7f8f4f29e99b48d816a996030ac46 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
@@ -14,8 +14,8 @@ use Zend\Form\Element;
use Zend\Form\ElementPrepareAwareInterface;
use Zend\Form\FormInterface;
use Zend\InputFilter\InputProviderInterface;
-use Zend\Validator\ValidatorInterface;
use Zend\Validator\Regex as RegexValidator;
+use Zend\Validator\ValidatorInterface;
class MonthSelect extends Element implements InputProviderInterface, ElementPrepareAwareInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
index 11d2896193a848e5046ba9eb16d2f7e9ba0793e7..ee514c69e9c35584452a85fec1754fd6d18423b9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
@@ -18,9 +18,9 @@
namespace Zend\Form\Element;
-use Zend\Form\FormInterface;
use Zend\Form\Element;
use Zend\Form\ElementPrepareAwareInterface;
+use Zend\Form\FormInterface;
/**
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
index 56b8160dbb427caff72e88e44a3cdf5e3ab38d6f..40601ffca041705969bf9ef405e1b26fd4f29b52 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
@@ -46,6 +46,11 @@ class Select extends Element implements InputProviderInterface
*/
protected $validator;
+ /**
+ * @var bool
+ */
+ protected $disableInArrayValidator = false;
+
/**
* Create an empty option (option with label but no value). If set to null, no option is created
*
@@ -76,15 +81,15 @@ class Select extends Element implements InputProviderInterface
// Update InArrayValidator validator haystack
if (null !== $this->validator) {
- if ($this->validator instanceof InArrayValidator){
+ if ($this->validator instanceof InArrayValidator) {
$validator = $this->validator;
}
if ($this->validator instanceof ExplodeValidator
&& $this->validator->getValidator() instanceof InArrayValidator
- ){
+ ) {
$validator = $this->validator->getValidator();
}
- if (!empty($validator)){
+ if (!empty($validator)) {
$validator->setHaystack($this->getValueOptionsValues());
}
}
@@ -119,6 +124,10 @@ class Select extends Element implements InputProviderInterface
$this->setEmptyOption($this->options['empty_option']);
}
+ if (isset($this->options['disable_inarray_validator'])) {
+ $this->setDisableInArrayValidator($this->options['disable_inarray_validator']);
+ }
+
return $this;
}
@@ -140,6 +149,28 @@ class Select extends Element implements InputProviderInterface
return parent::setAttribute($key, $value);
}
+ /**
+ * Set the flag to allow for disabling the automatic addition of an InArray validator.
+ *
+ * @param bool $disableOption
+ * @return Select
+ */
+ public function setDisableInArrayValidator($disableOption)
+ {
+ $this->disableInArrayValidator = (bool) $disableOption;
+ return $this;
+ }
+
+ /**
+ * Get the disable in array validator flag.
+ *
+ * @return bool
+ */
+ public function disableInArrayValidator()
+ {
+ return $this->disableInArrayValidator;
+ }
+
/**
* Set the string for an empty option (can be empty string). If set to null, no option will be added
*
@@ -169,7 +200,7 @@ class Select extends Element implements InputProviderInterface
*/
protected function getValidator()
{
- if (null === $this->validator) {
+ if (null === $this->validator && !$this->disableInArrayValidator()) {
$validator = new InArrayValidator(array(
'haystack' => $this->getValueOptionsValues(),
'strict' => false
@@ -202,11 +233,14 @@ class Select extends Element implements InputProviderInterface
$spec = array(
'name' => $this->getName(),
'required' => true,
- 'validators' => array(
- $this->getValidator()
- )
);
+ if ($validator = $this->getValidator()) {
+ $spec['validators'] = array(
+ $validator,
+ );
+ }
+
return $spec;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b2d54f46fa07d700b7d8b3eb8aba0aeb84510eb
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Form\Exception;
+
+class ExtensionNotLoadedException extends DomainException
+{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Factory.php b/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
index d9f47e0f3e78ff29bf640030849ed223e3e7fccc..f651744c44450d5dc1a077b9265be13fcb4cbbf4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
@@ -413,7 +413,7 @@ class Factory
*/
protected function prepareAndInjectHydrator($hydratorOrName, FieldsetInterface $fieldset, $method)
{
- if (is_object($hydratorOrName) && $hydratorOrName instanceof Hydrator\HydratorInterface) {
+ if ($hydratorOrName instanceof Hydrator\HydratorInterface) {
$fieldset->setHydrator($hydratorOrName);
return;
}
@@ -468,6 +468,11 @@ class Factory
*/
protected function prepareAndInjectInputFilter($spec, FormInterface $form, $method)
{
+ if ($spec instanceof InputFilterInterface) {
+ $form->setInputFilter($spec);
+ return;
+ }
+
if (is_string($spec)) {
if (!class_exists($spec)) {
throw new Exception\DomainException(sprintf(
@@ -490,6 +495,9 @@ class Factory
$factory = $this->getInputFilterFactory();
$filter = $factory->createInputFilter($spec);
+ if (method_exists($filter, 'setFactory')) {
+ $filter->setFactory($factory);
+ }
$form->setInputFilter($filter);
}
@@ -528,10 +536,17 @@ class Factory
*/
protected function getHydratorFromName($hydratorName)
{
- $serviceLocator = $this->getFormElementManager()->getServiceLocator();
+ $services = $this->getFormElementManager()->getServiceLocator();
+
+ if ($services && $services->has('HydratorManager')) {
+ $hydrators = $services->get('HydratorManager');
+ if ($hydrators->has($hydratorName)) {
+ return $hydrators->get($hydratorName);
+ }
+ }
- if ($serviceLocator && $serviceLocator->has($hydratorName)) {
- return $serviceLocator->get($hydratorName);
+ if ($services && $services->has($hydratorName)) {
+ return $services->get($hydratorName);
}
if (!class_exists($hydratorName)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
index 5ae078158e7a3024e07e6dce6ed12b5636e3f041..53ea961259ec1b01d638700ca7ccb0918d29e43d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
@@ -11,6 +11,7 @@ namespace Zend\Form;
use Traversable;
use Zend\Stdlib\Hydrator;
+use Zend\Stdlib\Hydrator\HydratorAwareInterface;
use Zend\Stdlib\Hydrator\HydratorInterface;
use Zend\Stdlib\PriorityQueue;
@@ -480,6 +481,9 @@ class Fieldset extends Element implements FieldsetInterface
/**
* Get the hydrator used when binding an object to the fieldset
*
+ * If no hydrator is present and object implements HydratorAwareInterface,
+ * hydrator will be retrieved from the object.
+ *
* Will lazy-load Hydrator\ArraySerializable if none is present.
*
* @return HydratorInterface
@@ -487,7 +491,11 @@ class Fieldset extends Element implements FieldsetInterface
public function getHydrator()
{
if (!$this->hydrator instanceof HydratorInterface) {
- $this->setHydrator(new Hydrator\ArraySerializable());
+ if ($this->object instanceof HydratorAwareInterface) {
+ $this->setHydrator($this->object->getHydrator());
+ } else {
+ $this->setHydrator(new Hydrator\ArraySerializable());
+ }
}
return $this->hydrator;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Form.php b/vendor/zendframework/zendframework/library/Zend/Form/Form.php
index 4b97f09813d6154a9d45234711fe7b00534f66a9..9417d0056896a01d3d485a5fe32081f14dd1f338 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Form.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Form.php
@@ -12,6 +12,7 @@ namespace Zend\Form;
use Traversable;
use Zend\Form\Element\Collection;
use Zend\Form\Exception;
+use Zend\InputFilter\CollectionInputFilter;
use Zend\InputFilter\InputFilter;
use Zend\InputFilter\InputFilterAwareInterface;
use Zend\InputFilter\InputFilterInterface;
@@ -186,6 +187,29 @@ class Form extends Fieldset implements FormInterface
return $this;
}
+ /**
+ * Ensures state is ready for use. Here, we append the name of the fieldsets to every elements in order to avoid
+ * name clashes if the same fieldset is used multiple times
+ *
+ * @param FormInterface $form
+ * @return mixed|void
+ */
+ public function prepareElement(FormInterface $form)
+ {
+ $name = $this->getName();
+
+ foreach ($this->byName as $elementOrFieldset) {
+ if ($form->wrapElements()) {
+ $elementOrFieldset->setName($name . '[' . $elementOrFieldset->getName() . ']');
+ }
+
+ // Recursively prepare elements
+ if ($elementOrFieldset instanceof ElementPrepareAwareInterface) {
+ $elementOrFieldset->prepareElement($form);
+ }
+ }
+ }
+
/**
* Set data to validate and/or populate elements
*
@@ -272,7 +296,7 @@ class Form extends Fieldset implements FormInterface
public function bindValues(array $values = array())
{
if (!is_object($this->object)) {
- if ( $this->baseFieldset === null || $this->baseFieldset->allowValueBinding() == false ) {
+ if ($this->baseFieldset === null || $this->baseFieldset->allowValueBinding() == false) {
return;
}
}
@@ -571,7 +595,7 @@ class Form extends Fieldset implements FormInterface
$values = array();
if (isset($data[$key])) {
- foreach(array_keys($data[$key]) as $cKey) {
+ foreach (array_keys($data[$key]) as $cKey) {
$values[$cKey] = $value;
}
}
@@ -691,46 +715,58 @@ class Form extends Fieldset implements FormInterface
$formFactory = $this->getFormFactory();
$inputFactory = $formFactory->getInputFilterFactory();
- if ($this instanceof InputFilterProviderInterface) {
- foreach ($this->getInputFilterSpecification() as $name => $spec) {
+ if ($fieldset === $this && $fieldset instanceof InputFilterProviderInterface) {
+ foreach ($fieldset->getInputFilterSpecification() as $name => $spec) {
$input = $inputFactory->createInput($spec);
$inputFilter->add($input, $name);
}
}
- foreach ($fieldset->getElements() as $element) {
- $name = $element->getName();
+ if ($fieldset instanceof Collection && $fieldset->getTargetElement() instanceof FieldsetInterface) {
+ $elements = $fieldset->getTargetElement()->getElements();
+ } else {
+ $elements = $fieldset->getElements();
+ }
- if ($this->preferFormInputFilter && $inputFilter->has($name)) {
- continue;
- }
+ if (!$fieldset instanceof Collection || $inputFilter instanceof CollectionInputFilter) {
+ foreach ($elements as $element) {
+ $name = $element->getName();
- if (!$element instanceof InputProviderInterface) {
- if ($inputFilter->has($name)) {
+ if ($this->preferFormInputFilter && $inputFilter->has($name)) {
continue;
}
- // Create a new empty default input for this element
- $spec = array('name' => $name, 'required' => false);
- } else {
- // Create an input based on the specification returned from the element
- $spec = $element->getInputSpecification();
- }
- $input = $inputFactory->createInput($spec);
- $inputFilter->add($input, $name);
+ if (!$element instanceof InputProviderInterface) {
+ if ($inputFilter->has($name)) {
+ continue;
+ }
+ // Create a new empty default input for this element
+ $spec = array('name' => $name, 'required' => false);
+ } else {
+ // Create an input based on the specification returned from the element
+ $spec = $element->getInputSpecification();
+ }
+
+ $input = $inputFactory->createInput($spec);
+ $inputFilter->add($input, $name);
+ }
}
- foreach ($fieldset->getFieldsets() as $fieldset) {
- $name = $fieldset->getName();
+ foreach ($fieldset->getFieldsets() as $childFieldset) {
+ $name = $childFieldset->getName();
- if (!$fieldset instanceof InputFilterProviderInterface) {
+ if (!$childFieldset instanceof InputFilterProviderInterface) {
if (!$inputFilter->has($name)) {
// Add a new empty input filter if it does not exist (or the fieldset's object input filter),
// so that elements of nested fieldsets can be recursively added
- if ($fieldset->getObject() instanceof InputFilterAwareInterface) {
- $inputFilter->add($fieldset->getObject()->getInputFilter(), $name);
+ if ($childFieldset->getObject() instanceof InputFilterAwareInterface) {
+ $inputFilter->add($childFieldset->getObject()->getInputFilter(), $name);
} else {
- $inputFilter->add(new InputFilter(), $name);
+ if ($fieldset instanceof Collection && $inputFilter instanceof CollectionInputFilter) {
+ continue;
+ } else {
+ $inputFilter->add(new InputFilter(), $name);
+ }
}
}
@@ -743,7 +779,7 @@ class Form extends Fieldset implements FormInterface
// Traverse the elements of the fieldset, and attach any
// defaults to the fieldset's input filter
- $this->attachInputFilterDefaults($fieldsetFilter, $fieldset);
+ $this->attachInputFilterDefaults($fieldsetFilter, $childFieldset);
continue;
}
@@ -753,12 +789,12 @@ class Form extends Fieldset implements FormInterface
}
// Create an input filter based on the specification returned from the fieldset
- $spec = $fieldset->getInputFilterSpecification();
+ $spec = $childFieldset->getInputFilterSpecification();
$filter = $inputFactory->createInputFilter($spec);
$inputFilter->add($filter, $name);
// Recursively attach sub filters
- $this->attachInputFilterDefaults($filter, $fieldset);
+ $this->attachInputFilterDefaults($filter, $childFieldset);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..ab77744e5d4083a86641c198d33b7651af481931
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Form;
+
+use Zend\InputFilter\InputFilterInterface;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class FormAbstractServiceFactory implements AbstractFactoryInterface
+{
+ /**
+ * @var array
+ */
+ protected $config;
+
+ /**
+ * @var string Top-level configuration key indicating forms configuration
+ */
+ protected $configKey = 'forms';
+
+ /**
+ * @var Factory Form factory used to create forms
+ */
+ protected $factory;
+
+ /**
+ * Can we create the requested service?
+ *
+ * @param ServiceLocatorInterface $services
+ * @param string $name Service name (as resolved by ServiceManager)
+ * @param string $rName Name by which service was requested
+ * @return bool
+ */
+ public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $rName)
+ {
+ $config = $this->getConfig($services);
+ if (empty($config)) {
+ return false;
+ }
+
+ return (isset($config[$rName]) && is_array($config[$rName]) && !empty($config[$rName]));
+ }
+
+ /**
+ * Create a form
+ *
+ * @param ServiceLocatorInterface $services
+ * @param string $name Service name (as resolved by ServiceManager)
+ * @param string $rName Name by which service was requested
+ * @return Form
+ */
+ public function createServiceWithName(ServiceLocatorInterface $services, $name, $rName)
+ {
+ $config = $this->getConfig($services);
+ $config = $config[$rName];
+ $factory = $this->getFormFactory($services);
+
+ $this->marshalInputFilter($config, $services, $factory);
+ return $factory->createForm($config);
+ }
+
+ /**
+ * Get forms configuration, if any
+ *
+ * @param ServiceLocatorInterface $services
+ * @return array
+ */
+ protected function getConfig(ServiceLocatorInterface $services)
+ {
+ if ($this->config !== null) {
+ return $this->config;
+ }
+
+ if (!$services->has('Config')) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $config = $services->get('Config');
+ if (!isset($config[$this->configKey])
+ || !is_array($config[$this->configKey])
+ ) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $this->config = $config[$this->configKey];
+ return $this->config;
+ }
+
+ /**
+ * Retrieve the form factory, creating it if necessary
+ *
+ * @param ServiceLocatorInterface $services
+ * @return Factory
+ */
+ protected function getFormFactory(ServiceLocatorInterface $services)
+ {
+ if ($this->factory instanceof Factory) {
+ return $this->factory;
+ }
+
+ $elements = null;
+ if ($services->has('FormElementManager')) {
+ $elements = $services->get('FormElementManager');
+ }
+
+ $this->factory = new Factory($elements);
+ return $this->factory;
+ }
+
+ /**
+ * Marshal the input filter into the configuration
+ *
+ * If an input filter is specified:
+ * - if the InputFilterManager is present, checks if it's there; if so,
+ * retrieves it and resets the specification to the instance.
+ * - otherwise, pulls the input filter factory from the form factory, and
+ * attaches the FilterManager and ValidatorManager to it.
+ *
+ * @param array $config
+ * @param ServiceLocatorInterface $services
+ * @param Factory $formFactory
+ */
+ protected function marshalInputFilter(array &$config, ServiceLocatorInterface $services, Factory $formFactory)
+ {
+ if (!isset($config['input_filter'])) {
+ return;
+ }
+
+ if ($config['input_filter'] instanceof InputFilterInterface) {
+ return;
+ }
+
+ if (is_string($config['input_filter'])
+ && $services->has('InputFilterManager')
+ ) {
+ $inputFilters = $services->get('InputFilterManager');
+ if ($inputFilters->has($config['input_filter'])) {
+ $config['input_filter'] = $inputFilters->get($config['input_filter']);
+ return;
+ }
+ }
+
+ $inputFilterFactory = $formFactory->getInputFilterFactory();
+ $inputFilterFactory->getDefaultFilterChain()->setPluginManager($services->get('FilterManager'));
+ $inputFilterFactory->getDefaultValidatorChain()->setPluginManager($services->get('ValidatorManager'));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php b/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php
index da30fd943241e4208f3c2e58661e8329448d5215..fc7561f7b12d8997455defba70a990fed796cb0e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php
@@ -11,6 +11,7 @@ namespace Zend\Form;
use Zend\ServiceManager\AbstractPluginManager;
use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\Stdlib\InitializableInterface;
/**
@@ -85,7 +86,15 @@ class FormElementManager extends AbstractPluginManager
public function injectFactory($element)
{
if ($element instanceof FormFactoryAwareInterface) {
- $element->getFormFactory()->setFormElementManager($this);
+ $factory = $element->getFormFactory();
+ $factory->setFormElementManager($this);
+
+ if ($this->serviceLocator instanceof ServiceLocatorInterface
+ && $this->serviceLocator->has('InputFilterManager')
+ ) {
+ $inputFilters = $this->serviceLocator->get('InputFilterManager');
+ $factory->getInputFilterFactory()->setInputFilterManager($inputFilters);
+ }
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php
index 484a4739c2e2cff632d270840a68bc9e3e7e3daf..cfeba98aa79fb755f7a976624e783c6c7a9915f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php
@@ -203,7 +203,6 @@ abstract class AbstractHelper extends BaseAbstractHelper
public function createAttributesString(array $attributes)
{
$attributes = $this->prepareAttributes($attributes);
-
$escape = $this->getEscapeHtmlHelper();
$strings = array();
foreach ($attributes as $key => $value) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
index 48386caa02db8b9114c3b17a7b2f78dc690a0de4..76b80cf788e7590c47605ec20051983dcf37de27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
@@ -30,65 +30,27 @@ abstract class AbstractWord extends FormInput
protected $captchaPosition = self::CAPTCHA_APPEND;
/**
+ * Separator string for captcha and inputs
+ *
* @var string
*/
protected $separator = '';
/**
- * Set value for captchaPosition
+ * Invoke helper as functor
*
- * @param mixed $captchaPosition
- * @throws Exception\InvalidArgumentException
- * @return self
- */
- public function setCaptchaPosition($captchaPosition)
- {
- $captchaPosition = strtolower($captchaPosition);
- if (!in_array($captchaPosition, array(self::CAPTCHA_APPEND, self::CAPTCHA_PREPEND))) {
- throw new Exception\InvalidArgumentException(sprintf(
- '%s expects either %s::CAPTCHA_APPEND or %s::CAPTCHA_PREPEND; received "%s"',
- __METHOD__,
- __CLASS__,
- __CLASS__,
- (string) $captchaPosition
- ));
- }
- $this->captchaPosition = $captchaPosition;
-
- return $this;
- }
-
- /**
- * Get position of captcha
+ * Proxies to {@link render()}.
*
+ * @param ElementInterface $element
* @return string
*/
- public function getCaptchaPosition()
- {
- return $this->captchaPosition;
- }
-
- /**
- * Set separator string for captcha and inputs
- *
- * @param string $separator
- * @return AbstractWord
- */
- public function setSeparator($separator)
+ public function __invoke(ElementInterface $element = null)
{
- $this->separator = (string) $separator;
-
- return $this;
- }
+ if (!$element) {
+ return $this;
+ }
- /**
- * Get separator for captcha and inputs
- *
- * @return string
- */
- public function getSeparator()
- {
- return $this->separator;
+ return $this->render($element);
}
/**
@@ -100,7 +62,7 @@ abstract class AbstractWord extends FormInput
*
* More specific renderers will consume this and render it.
*
- * @param ElementInterface $element
+ * @param ElementInterface $element
* @throws Exception\DomainException
* @return string
*/
@@ -124,29 +86,12 @@ abstract class AbstractWord extends FormInput
));
}
- $hidden = $this->renderCaptchaHidden($captcha, $attributes);
- $input = $this->renderCaptchaInput($captcha, $attributes);
+ $hidden = $this->renderCaptchaHidden($captcha, $attributes);
+ $input = $this->renderCaptchaInput($captcha, $attributes);
return $hidden . $input;
}
- /**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface $element
- * @return string
- */
- public function __invoke(ElementInterface $element = null)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element);
- }
-
/**
* Render the hidden input with the captcha identifier
*
@@ -203,4 +148,60 @@ abstract class AbstractWord extends FormInput
return $input;
}
+
+ /**
+ * Set value for captchaPosition
+ *
+ * @param mixed $captchaPosition
+ * @throws Exception\InvalidArgumentException
+ * @return AbstractWord
+ */
+ public function setCaptchaPosition($captchaPosition)
+ {
+ $captchaPosition = strtolower($captchaPosition);
+ if (!in_array($captchaPosition, array(self::CAPTCHA_APPEND, self::CAPTCHA_PREPEND))) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects either %s::CAPTCHA_APPEND or %s::CAPTCHA_PREPEND; received "%s"',
+ __METHOD__,
+ __CLASS__,
+ __CLASS__,
+ (string) $captchaPosition
+ ));
+ }
+ $this->captchaPosition = $captchaPosition;
+
+ return $this;
+ }
+
+ /**
+ * Get position of captcha
+ *
+ * @return string
+ */
+ public function getCaptchaPosition()
+ {
+ return $this->captchaPosition;
+ }
+
+ /**
+ * Set separator string for captcha and inputs
+ *
+ * @param string $separator
+ * @return AbstractWord
+ */
+ public function setSeparator($separator)
+ {
+ $this->separator = (string) $separator;
+ return $this;
+ }
+
+ /**
+ * Get separator for captcha and inputs
+ *
+ * @return string
+ */
+ public function getSeparator()
+ {
+ return $this->separator;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
index c731d9d6c38bd47087e974b8cc6d2d926aef2b30..9dfb0abb3303a511cc302106a3ea02d1bd06a2d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
@@ -16,6 +16,23 @@ use Zend\Form\View\Helper\FormInput;
class ReCaptcha extends FormInput
{
+ /**
+ * Invoke helper as functor
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface $element
+ * @return string
+ */
+ public function __invoke(ElementInterface $element = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element);
+ }
+
/**
* Render ReCaptcha form elements
*
@@ -49,23 +66,6 @@ class ReCaptcha extends FormInput
return $hidden . $markup . $js;
}
- /**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface $element
- * @return string
- */
- public function __invoke(ElementInterface $element = null)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element);
- }
-
/**
* Render hidden input elements for the challenge and response
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php
index 793786e4094765a787e06f28b49702c4ee8ff211..0170bf9add88a9a28550f3438568199e3ba87da8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php
@@ -44,6 +44,59 @@ class FormButton extends FormInput
'submit' => true,
);
+ /**
+ * Invoke helper as functor
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface|null $element
+ * @param null|string $buttonContent
+ * @return string|FormButton
+ */
+ public function __invoke(ElementInterface $element = null, $buttonContent = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element, $buttonContent);
+ }
+
+ /**
+ * Render a form <button> element from the provided $element,
+ * using content from $buttonContent or the element's "label" attribute
+ *
+ * @param ElementInterface $element
+ * @param null|string $buttonContent
+ * @throws Exception\DomainException
+ * @return string
+ */
+ public function render(ElementInterface $element, $buttonContent = null)
+ {
+ $openTag = $this->openTag($element);
+
+ if (null === $buttonContent) {
+ $buttonContent = $element->getLabel();
+ if (null === $buttonContent) {
+ throw new Exception\DomainException(sprintf(
+ '%s expects either button content as the second argument, ' .
+ 'or that the element provided has a label value; neither found',
+ __METHOD__
+ ));
+ }
+
+ if (null !== ($translator = $this->getTranslator())) {
+ $buttonContent = $translator->translate(
+ $buttonContent, $this->getTranslatorTextDomain()
+ );
+ }
+ }
+
+ $escape = $this->getEscapeHtmlHelper();
+
+ return $openTag . $escape($buttonContent) . $this->closeTag();
+ }
+
/**
* Generate an opening button tag
*
@@ -101,59 +154,6 @@ class FormButton extends FormInput
return '</button>';
}
- /**
- * Render a form <button> element from the provided $element,
- * using content from $buttonContent or the element's "label" attribute
- *
- * @param ElementInterface $element
- * @param null|string $buttonContent
- * @throws Exception\DomainException
- * @return string
- */
- public function render(ElementInterface $element, $buttonContent = null)
- {
- $openTag = $this->openTag($element);
-
- if (null === $buttonContent) {
- $buttonContent = $element->getLabel();
- if (null === $buttonContent) {
- throw new Exception\DomainException(sprintf(
- '%s expects either button content as the second argument, ' .
- 'or that the element provided has a label value; neither found',
- __METHOD__
- ));
- }
-
- if (null !== ($translator = $this->getTranslator())) {
- $buttonContent = $translator->translate(
- $buttonContent, $this->getTranslatorTextDomain()
- );
- }
- }
-
- $escape = $this->getEscapeHtmlHelper();
-
- return $openTag . $escape($buttonContent) . $this->closeTag();
- }
-
- /**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface|null $element
- * @param null|string $buttonContent
- * @return string|FormButton
- */
- public function __invoke(ElementInterface $element = null, $buttonContent = null)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element, $buttonContent);
- }
-
/**
* Determine button type to use
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php
index f7476d9ea0da3d829743b5ac4515fdde3596b667..551244b40c483987bb2a2b1c8bec7b109e2a2fe9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php
@@ -15,12 +15,29 @@ use Zend\Form\Exception;
class FormCaptcha extends AbstractHelper
{
+ /**
+ * Invoke helper as functor
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface $element
+ * @return string|FormCaptcha
+ */
+ public function __invoke(ElementInterface $element)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element);
+ }
+
/**
* Render a form captcha for an element
*
* @param ElementInterface $element
- * @return string
* @throws Exception\DomainException if the element does not compose a captcha, or the renderer does not implement plugin()
+ * @return string
*/
public function render(ElementInterface $element)
{
@@ -46,21 +63,4 @@ class FormCaptcha extends AbstractHelper
$helper = $renderer->plugin($helper);
return $helper($element);
}
-
- /**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface $element
- * @return string|FormCaptcha
- */
- public function __invoke(ElementInterface $element)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element);
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php
index cc52c4d2904aecd8cf3476ad1d2dd5e42de8eb6c..bd4569ff2912bf9898d7d7600109339e36371213 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php
@@ -46,6 +46,26 @@ class FormCollection extends AbstractHelper
*/
protected $fieldsetHelper;
+ /**
+ * Invoke helper as function
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface|null $element
+ * @param bool $wrap
+ * @return string|FormCollection
+ */
+ public function __invoke(ElementInterface $element = null, $wrap = true)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ $this->setShouldWrap($wrap);
+
+ return $this->render($element);
+ }
+
/**
* Render a collection by iterating through all fieldsets and elements
*
@@ -111,7 +131,7 @@ class FormCollection extends AbstractHelper
/**
* Only render a template
*
- * @param CollectionElement $collection
+ * @param CollectionElement $collection
* @return string
*/
public function renderTemplate(CollectionElement $collection)
@@ -134,30 +154,10 @@ class FormCollection extends AbstractHelper
);
}
- /**
- * Invoke helper as function
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface|null $element
- * @param bool $wrap
- * @return string|FormCollection
- */
- public function __invoke(ElementInterface $element = null, $wrap = true)
- {
- if (!$element) {
- return $this;
- }
-
- $this->setShouldWrap($wrap);
-
- return $this->render($element);
- }
-
/**
* If set to true, collections are automatically wrapped around a fieldset
*
- * @param bool $wrap
+ * @param bool $wrap
* @return FormCollection
*/
public function setShouldWrap($wrap)
@@ -176,6 +176,18 @@ class FormCollection extends AbstractHelper
return $this->shouldWrap;
}
+ /**
+ * Sets the name of the view helper that should be used to render sub elements.
+ *
+ * @param string $defaultSubHelper The name of the view helper to set.
+ * @return FormCollection
+ */
+ public function setDefaultElementHelper($defaultSubHelper)
+ {
+ $this->defaultElementHelper = $defaultSubHelper;
+ return $this;
+ }
+
/**
* Gets the name of the view helper that should be used to render sub elements.
*
@@ -187,22 +199,22 @@ class FormCollection extends AbstractHelper
}
/**
- * Sets the name of the view helper that should be used to render sub elements.
+ * Sets the element helper that should be used by this collection.
*
- * @param string $defaultSubHelper The name of the view helper to set.
+ * @param AbstractHelper $elementHelper The element helper to use.
* @return FormCollection
*/
- public function setDefaultElementHelper($defaultSubHelper)
+ public function setElementHelper(AbstractHelper $elementHelper)
{
- $this->defaultElementHelper = $defaultSubHelper;
+ $this->elementHelper = $elementHelper;
return $this;
}
/**
* Retrieve the element helper.
*
- * @throws RuntimeException
* @return AbstractHelper
+ * @throws RuntimeException
*/
protected function getElementHelper()
{
@@ -223,21 +235,21 @@ class FormCollection extends AbstractHelper
}
/**
- * Sets the element helper that should be used by this collection.
+ * Sets the fieldset helper that should be used by this collection.
*
- * @param AbstractHelper $elementHelper The element helper to use.
+ * @param AbstractHelper $fieldsetHelper The fieldset helper to use.
* @return FormCollection
*/
- public function setElementHelper(AbstractHelper $elementHelper)
+ public function setFieldsetHelper(AbstractHelper $fieldsetHelper)
{
- $this->elementHelper = $elementHelper;
+ $this->fieldsetHelper = $fieldsetHelper;
return $this;
}
/**
* Retrieve the fieldset helper.
*
- * @return AbstractHelper
+ * @return FormCollection
*/
protected function getFieldsetHelper()
{
@@ -245,19 +257,6 @@ class FormCollection extends AbstractHelper
return $this->fieldsetHelper;
}
- //if no special fieldset helper was set fall back to FormCollection helper
- return $this;
- }
-
- /**
- * Sets the fieldset helper that should be used by this collection.
- *
- * @param AbstractHelper $fieldsetHelper The fieldset helper to use.
- * @return FormCollection
- */
- public function setFieldsetHelper(AbstractHelper $fieldsetHelper)
- {
- $this->fieldsetHelper = $fieldsetHelper;
return $this;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
index 21bc4f45863c09c8f1be34e0634cb96ec87787ce..5508a5ef5c0dbcc69cad03829ab4a15d5bbca971 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
@@ -81,7 +81,7 @@ class FormDateSelect extends FormMonthSelectHelper
/**
* Create a key => value options for days
*
- * @param string $pattern Pattern to use for days
+ * @param string $pattern Pattern to use for days
* @return array
*/
protected function getDaysOptions($pattern)
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php
index b766ccbf409292628c50b7a49957c1e83fa0f83f..a2228dafd114704cf0188e9a33a91a1cf391cfad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php
@@ -23,16 +23,57 @@ class FormDateTimeSelect extends FormDateSelectHelper
*
* @var int
*/
- protected $timeType = IntlDateFormatter::LONG;
+ protected $timeType;
+ /**
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+ */
+ public function __construct()
+ {
+ parent::__construct();
+
+ // Delaying initialization until we know ext/intl is available
+ $this->timeType = IntlDateFormatter::LONG;
+ }
+
+ /**
+ * Invoke helper as function
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface $element
+ * @param int $dateType
+ * @param int|null|string $timeType
+ * @param null|string $locale
+ * @return string
+ */
+ public function __invoke(
+ ElementInterface $element = null,
+ $dateType = IntlDateFormatter::LONG,
+ $timeType = IntlDateFormatter::LONG,
+ $locale = null
+ ) {
+ if (!$element) {
+ return $this;
+ }
+
+ $this->setDateType($dateType);
+ $this->setTimeType($timeType);
+
+ if ($locale !== null) {
+ $this->setLocale($locale);
+ }
+
+ return $this->render($element);
+ }
/**
* Render a date element that is composed of six selects
*
* @param ElementInterface $element
+ * @return string
* @throws \Zend\Form\Exception\InvalidArgumentException
* @throws \Zend\Form\Exception\DomainException
- * @return string
*/
public function render(ElementInterface $element)
{
@@ -108,37 +149,6 @@ class FormDateTimeSelect extends FormDateSelectHelper
return $markup;
}
- /**
- * Invoke helper as function
- *
- * Proxies to {@link render()}.
- *
- * @param \Zend\Form\ElementInterface $element
- * @param int $dateType
- * @param int|null|string $timeType
- * @param null|string $locale
- * @return string
- */
- public function __invoke(
- ElementInterface $element = null,
- $dateType = IntlDateFormatter::LONG,
- $timeType = IntlDateFormatter::LONG,
- $locale = null
- ) {
- if (!$element) {
- return $this;
- }
-
- $this->setDateType($dateType);
- $this->setTimeType($timeType);
-
- if ($locale !== null) {
- $this->setLocale($locale);
- }
-
- return $this->render($element);
- }
-
/**
* @param int $timeType
* @return FormDateTimeSelect
@@ -219,7 +229,7 @@ class FormDateTimeSelect extends FormDateSelectHelper
/**
* Create a key => value options for hours
*
- * @param string $pattern Pattern to use for hours
+ * @param string $pattern Pattern to use for hours
* @return array
*/
protected function getHoursOptions($pattern)
@@ -243,7 +253,7 @@ class FormDateTimeSelect extends FormDateSelectHelper
/**
* Create a key => value options for minutes
*
- * @param string $pattern Pattern to use for minutes
+ * @param string $pattern Pattern to use for minutes
* @return array
*/
protected function getMinutesOptions($pattern)
@@ -267,7 +277,7 @@ class FormDateTimeSelect extends FormDateSelectHelper
/**
* Create a key => value options for seconds
*
- * @param string $pattern Pattern to use for seconds
+ * @param string $pattern Pattern to use for seconds
* @return array
*/
protected function getSecondsOptions($pattern)
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
index ef54f50cf1da3979200cb4938763258158ae3f49..d125999d371d81b965085ee0394b5ce55fbc1113 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
@@ -15,6 +15,23 @@ use Zend\View\Helper\AbstractHelper as BaseAbstractHelper;
class FormElement extends BaseAbstractHelper
{
+ /**
+ * Invoke helper as function
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface|null $element
+ * @return string|FormElement
+ */
+ public function __invoke(ElementInterface $element = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element);
+ }
+
/**
* Render an element
*
@@ -197,21 +214,4 @@ class FormElement extends BaseAbstractHelper
$helper = $renderer->plugin('form_input');
return $helper($element);
}
-
- /**
- * Invoke helper as function
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface|null $element
- * @return string|FormElement
- */
- public function __invoke(ElementInterface $element = null)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element);
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
index baca4d92b618240cfd97fa3d70a4d01e1ede99a1..b66bf06781373af85136c71384ff3b3c919fd59a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
@@ -29,156 +29,156 @@ class FormElementErrors extends AbstractHelper
protected $attributes = array();
/**
- * Set the string used to close message representation
+ * Invoke helper as functor
*
- * @param string $messageCloseString
- * @return FormElementErrors
+ * Proxies to {@link render()} if an element is passed.
+ *
+ * @param ElementInterface $element
+ * @param array $attributes
+ * @return string|FormElementErrors
*/
- public function setMessageCloseString($messageCloseString)
+ public function __invoke(ElementInterface $element = null, array $attributes = array())
{
- $this->messageCloseString = (string) $messageCloseString;
- return $this;
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element, $attributes);
}
/**
- * Get the string used to close message representation
+ * Render validation errors for the provided $element
*
+ * @param ElementInterface $element
+ * @param array $attributes
+ * @throws Exception\DomainException
* @return string
*/
- public function getMessageCloseString()
+ public function render(ElementInterface $element, array $attributes = array())
{
- return $this->messageCloseString;
+ $messages = $element->getMessages();
+ if (empty($messages)) {
+ return '';
+ }
+ if (!is_array($messages) && !$messages instanceof Traversable) {
+ throw new Exception\DomainException(sprintf(
+ '%s expects that $element->getMessages() will return an array or Traversable; received "%s"',
+ __METHOD__,
+ (is_object($messages) ? get_class($messages) : gettype($messages))
+ ));
+ }
+
+ // Prepare attributes for opening tag
+ $attributes = array_merge($this->attributes, $attributes);
+ $attributes = $this->createAttributesString($attributes);
+ if (!empty($attributes)) {
+ $attributes = ' ' . $attributes;
+ }
+
+ // Flatten message array
+ $escapeHtml = $this->getEscapeHtmlHelper();
+ $messagesToPrint = array();
+ array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml) {
+ $messagesToPrint[] = $escapeHtml($item);
+ });
+
+ if (empty($messagesToPrint)) {
+ return '';
+ }
+
+ // Generate markup
+ $markup = sprintf($this->getMessageOpenFormat(), $attributes);
+ $markup .= implode($this->getMessageSeparatorString(), $messagesToPrint);
+ $markup .= $this->getMessageCloseString();
+
+ return $markup;
}
/**
- * Set the formatted string used to open message representation
+ * Set the attributes that will go on the message open format
*
- * @param string $messageOpenFormat
+ * @param array $attributes key value pairs of attributes
* @return FormElementErrors
*/
- public function setMessageOpenFormat($messageOpenFormat)
+ public function setAttributes(array $attributes)
{
- $this->messageOpenFormat = (string) $messageOpenFormat;
+ $this->attributes = $attributes;
return $this;
}
/**
- * Get the formatted string used to open message representation
+ * Get the attributes that will go on the message open format
*
- * @return string
+ * @return array
*/
- public function getMessageOpenFormat()
+ public function getAttributes()
{
- return $this->messageOpenFormat;
+ return $this->attributes;
}
/**
- * Set the string used to separate messages
+ * Set the string used to close message representation
*
- * @param string $messageSeparatorString
+ * @param string $messageCloseString
* @return FormElementErrors
*/
- public function setMessageSeparatorString($messageSeparatorString)
+ public function setMessageCloseString($messageCloseString)
{
- $this->messageSeparatorString = (string) $messageSeparatorString;
+ $this->messageCloseString = (string) $messageCloseString;
return $this;
}
/**
- * Get the string used to separate messages
+ * Get the string used to close message representation
*
* @return string
*/
- public function getMessageSeparatorString()
+ public function getMessageCloseString()
{
- return $this->messageSeparatorString;
+ return $this->messageCloseString;
}
/**
- * Set the attributes that will go on the message open format
+ * Set the formatted string used to open message representation
*
- * @param array $attributes key value pairs of attributes
+ * @param string $messageOpenFormat
* @return FormElementErrors
*/
- public function setAttributes(array $attributes)
+ public function setMessageOpenFormat($messageOpenFormat)
{
- $this->attributes = $attributes;
+ $this->messageOpenFormat = (string) $messageOpenFormat;
return $this;
}
/**
- * Get the attributes that will go on the message open format
+ * Get the formatted string used to open message representation
*
- * @return array
+ * @return string
*/
- public function getAttributes()
+ public function getMessageOpenFormat()
{
- return $this->attributes;
+ return $this->messageOpenFormat;
}
/**
- * Render validation errors for the provided $element
+ * Set the string used to separate messages
*
- * @param ElementInterface $element
- * @param array $attributes
- * @throws Exception\DomainException
- * @return string
+ * @param string $messageSeparatorString
+ * @return FormElementErrors
*/
- public function render(ElementInterface $element, array $attributes = array())
+ public function setMessageSeparatorString($messageSeparatorString)
{
- $messages = $element->getMessages();
- if (empty($messages)) {
- return '';
- }
- if (!is_array($messages) && !$messages instanceof Traversable) {
- throw new Exception\DomainException(sprintf(
- '%s expects that $element->getMessages() will return an array or Traversable; received "%s"',
- __METHOD__,
- (is_object($messages) ? get_class($messages) : gettype($messages))
- ));
- }
-
- // Prepare attributes for opening tag
- $attributes = array_merge($this->attributes, $attributes);
- $attributes = $this->createAttributesString($attributes);
- if (!empty($attributes)) {
- $attributes = ' ' . $attributes;
- }
-
- // Flatten message array
- $escapeHtml = $this->getEscapeHtmlHelper();
- $messagesToPrint = array();
- array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml) {
- $messagesToPrint[] = $escapeHtml($item);
- });
-
- if (empty($messagesToPrint)) {
- return '';
- }
-
- // Generate markup
- $markup = sprintf($this->getMessageOpenFormat(), $attributes);
- $markup .= implode($this->getMessageSeparatorString(), $messagesToPrint);
- $markup .= $this->getMessageCloseString();
-
- return $markup;
+ $this->messageSeparatorString = (string) $messageSeparatorString;
+ return $this;
}
/**
- * Invoke helper as functor
- *
- * Proxies to {@link render()} if an element is passed.
+ * Get the string used to separate messages
*
- * @param ElementInterface $element
- * @param array $attributes
- * @return string|FormElementErrors
+ * @return string
*/
- public function __invoke(ElementInterface $element = null, array $attributes = array())
+ public function getMessageSeparatorString()
{
- if (!$element) {
- return $this;
- }
-
- return $this->render($element, $attributes);
+ return $this->messageSeparatorString;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php
index 21817d8f7bd8930e017d0905ddbcfb1b644a2ea9..083734993a0a96b38dfdd34ffe30c8637fa8287f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php
@@ -31,17 +31,6 @@ class FormFile extends FormInput
'value' => true,
);
- /**
- * Determine input type to use
- *
- * @param ElementInterface $element
- * @return string
- */
- protected function getType(ElementInterface $element)
- {
- return 'file';
- }
-
/**
* Render a form <input> element from the provided $element
*
@@ -79,4 +68,15 @@ class FormFile extends FormInput
$this->getInlineClosingBracket()
);
}
+
+ /**
+ * Determine input type to use
+ *
+ * @param ElementInterface $element
+ * @return string
+ */
+ protected function getType(ElementInterface $element)
+ {
+ return 'file';
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php
index 4c685239bcfc00afe316d3fde95776edf5374c44..93f56abdef8a92670799bc23108cfd6e95291587 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php
@@ -84,6 +84,23 @@ class FormInput extends AbstractHelper
'week' => true,
);
+ /**
+ * Invoke helper as functor
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface|null $element
+ * @return string|FormInput
+ */
+ public function __invoke(ElementInterface $element = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element);
+ }
+
/**
* Render a form <input> element from the provided $element
*
@@ -113,23 +130,6 @@ class FormInput extends AbstractHelper
);
}
- /**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface|null $element
- * @return string|FormInput
- */
- public function __invoke(ElementInterface $element = null)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element);
- }
-
/**
* Determine input type to use
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php
index fd3efa175146ea6a5036b5fb74786fe9840eaac2..384d180ee668cf1ae02037c123d6ab9ac2075a2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php
@@ -27,6 +27,62 @@ class FormLabel extends AbstractHelper
'form' => true,
);
+ /**
+ * Generate a form label, optionally with content
+ *
+ * Always generates a "for" statement, as we cannot assume the form input
+ * will be provided in the $labelContent.
+ *
+ * @param ElementInterface $element
+ * @param null|string $labelContent
+ * @param string $position
+ * @throws Exception\DomainException
+ * @return string|FormLabel
+ */
+ public function __invoke(ElementInterface $element = null, $labelContent = null, $position = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ $openTag = $this->openTag($element);
+ $label = '';
+ if ($labelContent === null || $position !== null) {
+ $label = $element->getLabel();
+ if (empty($label)) {
+ throw new Exception\DomainException(sprintf(
+ '%s expects either label content as the second argument, ' .
+ 'or that the element provided has a label attribute; neither found',
+ __METHOD__
+ ));
+ }
+
+ if (null !== ($translator = $this->getTranslator())) {
+ $label = $translator->translate(
+ $label, $this->getTranslatorTextDomain()
+ );
+ }
+ }
+
+ if ($label && $labelContent) {
+ switch ($position) {
+ case self::APPEND:
+ $labelContent .= $label;
+ break;
+ case self::PREPEND:
+ default:
+ $labelContent = $label . $labelContent;
+ break;
+ }
+ }
+
+ if ($label && null === $labelContent) {
+ $labelContent = $label;
+ }
+
+ return $openTag . $labelContent . $this->closeTag();
+ }
+
/**
* Generate an opening label tag
*
@@ -82,60 +138,4 @@ class FormLabel extends AbstractHelper
{
return '</label>';
}
-
- /**
- * Generate a form label, optionally with content
- *
- * Always generates a "for" statement, as we cannot assume the form input
- * will be provided in the $labelContent.
- *
- * @param ElementInterface $element
- * @param null|string $labelContent
- * @param string $position
- * @throws Exception\DomainException
- * @return string|FormLabel
- */
- public function __invoke(ElementInterface $element = null, $labelContent = null, $position = null)
- {
- if (!$element) {
- return $this;
- }
-
- $openTag = $this->openTag($element);
- $label = '';
- if ($labelContent === null || $position !== null) {
- $label = $element->getLabel();
- if (empty($label)) {
- throw new Exception\DomainException(sprintf(
- '%s expects either label content as the second argument, ' .
- 'or that the element provided has a label attribute; neither found',
- __METHOD__
- ));
- }
-
- if (null !== ($translator = $this->getTranslator())) {
- $label = $translator->translate(
- $label, $this->getTranslatorTextDomain()
- );
- }
- }
-
- if ($label && $labelContent) {
- switch ($position) {
- case self::APPEND:
- $labelContent .= $label;
- break;
- case self::PREPEND:
- default:
- $labelContent = $label . $labelContent;
- break;
- }
- }
-
- if ($label && null === $labelContent) {
- $labelContent = $label;
- }
-
- return $openTag . $labelContent . $this->closeTag();
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
index 298aeb0c5712612dd0877b6def66d9f99764e4dd..3979b7ded9cad88bf946d84dbf5d6fde232d7b48 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
@@ -30,7 +30,7 @@ class FormMonthSelect extends AbstractHelper
*
* @var int
*/
- protected $dateType = IntlDateFormatter::LONG;
+ protected $dateType;
/**
* Pattern to use for Date rendering
@@ -46,11 +46,51 @@ class FormMonthSelect extends AbstractHelper
*/
protected $locale;
+ /**
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+ */
+ public function __construct()
+ {
+ if (!extension_loaded('intl')) {
+ throw new Exception\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+
+ // Delaying initialization until we know ext/intl is available
+ $this->dateType = IntlDateFormatter::LONG;
+ }
+
+ /**
+ * Invoke helper as function
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface $element
+ * @param int $dateType
+ * @param null|string $locale
+ * @return FormDateSelect
+ */
+ public function __invoke(ElementInterface $element = null, $dateType = IntlDateFormatter::LONG, $locale = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ $this->setDateType($dateType);
+
+ if ($locale !== null) {
+ $this->setLocale($locale);
+ }
+
+ return $this->render($element);
+ }
/**
* Render a month element that is composed of two selects
*
- * @param \Zend\Form\ElementInterface $element
+ * @param \Zend\Form\ElementInterface $element
* @throws \Zend\Form\Exception\InvalidArgumentException
* @throws \Zend\Form\Exception\DomainException
* @return string
@@ -107,44 +147,6 @@ class FormMonthSelect extends AbstractHelper
return $markup;
}
- /**
- * Invoke helper as function
- *
- * Proxies to {@link render()}.
- *
- * @param \Zend\Form\ElementInterface $element
- * @param int $dateType
- * @param null|string $locale
- * @return FormDateSelect
- */
- public function __invoke(ElementInterface $element = null, $dateType = IntlDateFormatter::LONG, $locale = null)
- {
- if (!$element) {
- return $this;
- }
-
- $this->setDateType($dateType);
-
- if ($locale !== null) {
- $this->setLocale($locale);
- }
-
- return $this->render($element);
- }
-
- /**
- * @return string
- */
- public function getPattern()
- {
- if ($this->pattern === null) {
- $intl = new IntlDateFormatter($this->getLocale(), $this->dateType, IntlDateFormatter::NONE);
- $this->pattern = $intl->getPattern();
- }
-
- return $this->pattern;
- }
-
/**
* Parse the pattern
*
@@ -173,6 +175,23 @@ class FormMonthSelect extends AbstractHelper
}
/**
+ * Retrive pattern to use for Date rendering
+ *
+ * @return string
+ */
+ public function getPattern()
+ {
+ if (null === $this->pattern) {
+ $intl = new IntlDateFormatter($this->getLocale(), $this->dateType, IntlDateFormatter::NONE);
+ $this->pattern = $intl->getPattern();
+ }
+
+ return $this->pattern;
+ }
+
+ /**
+ * Set date formatter
+ *
* @param int $dateType
* @return FormDateSelect
*/
@@ -189,6 +208,8 @@ class FormMonthSelect extends AbstractHelper
}
/**
+ * Get date formatter
+ *
* @return int
*/
public function getDateType()
@@ -197,6 +218,8 @@ class FormMonthSelect extends AbstractHelper
}
/**
+ * Set locale
+ *
* @param string $locale
* @return FormDateSelect
*/
@@ -207,11 +230,13 @@ class FormMonthSelect extends AbstractHelper
}
/**
+ * Get locale
+ *
* @return string
*/
public function getLocale()
{
- if ($this->locale === null) {
+ if (null === $this->locale) {
$this->locale = Locale::getDefault();
}
@@ -264,7 +289,7 @@ class FormMonthSelect extends AbstractHelper
/**
* Retrieve the FormSelect helper
*
- * @return FormRow
+ * @return FormSelect
*/
protected function getSelectElementHelper()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php
index e6ad8ee74c1e5571605b13fd4f60800a504008c2..00bed6c02ca04cbde9feb5f818a9144982dc1c06 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php
@@ -19,162 +19,74 @@ class FormMultiCheckbox extends FormInput
const LABEL_PREPEND = 'prepend';
/**
- * @var bool
- */
- protected $useHiddenElement = false;
-
- /**
- * @var string
- */
- protected $uncheckedValue = '';
-
- /**
- * @var FormInput
- */
- protected $inputHelper;
-
- /**
- * @var FormLabel
- */
- protected $labelHelper;
-
- /**
- * @var string
- */
- protected $labelPosition = self::LABEL_APPEND;
-
- /**
+ * The attributes applied to option label
+ *
* @var array
*/
protected $labelAttributes;
/**
+ * Where will be label rendered?
+ *
* @var string
*/
- protected $separator = '';
+ protected $labelPosition = self::LABEL_APPEND;
/**
- * Set value for labelPosition
+ * Separator for checkbox elements
*
- * @param mixed $labelPosition
- * @throws Exception\InvalidArgumentException
- * @return FormMultiCheckbox
+ * @var string
*/
- public function setLabelPosition($labelPosition)
- {
- $labelPosition = strtolower($labelPosition);
- if (!in_array($labelPosition, array(self::LABEL_APPEND, self::LABEL_PREPEND))) {
- throw new Exception\InvalidArgumentException(sprintf(
- '%s expects either %s::LABEL_APPEND or %s::LABEL_PREPEND; received "%s"',
- __METHOD__,
- __CLASS__,
- __CLASS__,
- (string) $labelPosition
- ));
- }
- $this->labelPosition = $labelPosition;
-
- return $this;
- }
+ protected $separator = '';
/**
- * Get position of label
+ * Prefixing the element with a hidden element for the unset value?
*
- * @return string
+ * @var bool
*/
- public function getLabelPosition()
- {
- return $this->labelPosition;
- }
+ protected $useHiddenElement = false;
/**
- * Set separator string for checkbox elements
+ * The unchecked value used when "UseHiddenElement" is turned on
*
- * @param string $separator
- * @return FormMultiCheckbox
+ * @var string
*/
- public function setSeparator($separator)
- {
- $this->separator = (string) $separator;
- return $this;
- }
+ protected $uncheckedValue = '';
/**
- * Get separator for checkbox elements
+ * Form input helper instance
*
- * @return string
- */
- public function getSeparator()
- {
- return $this->separator;
- }
-
- /**
- * Sets the attributes applied to option label.
- *
- * @param array|null $attributes
- * @return FormMultiCheckbox
+ * @var FormInput
*/
- public function setLabelAttributes($attributes)
- {
- $this->labelAttributes = $attributes;
- return $this;
- }
+ protected $inputHelper;
/**
- * Returns the attributes applied to each option label.
+ * Form label helper instance
*
- * @return array|null
+ * @var FormLabel
*/
- public function getLabelAttributes()
- {
- return $this->labelAttributes;
- }
+ protected $labelHelper;
/**
- * Returns the option for prefixing the element with a hidden element
- * for the unset value.
+ * Invoke helper as functor
*
- * @return bool
- */
- public function getUseHiddenElement()
- {
- return $this->useHiddenElement;
- }
-
- /**
- * Sets the option for prefixing the element with a hidden element
- * for the unset value.
+ * Proxies to {@link render()}.
*
- * @param bool $useHiddenElement
- * @return FormMultiCheckbox
+ * @param ElementInterface|null $element
+ * @param null|string $labelPosition
+ * @return string|FormMultiCheckbox
*/
- public function setUseHiddenElement($useHiddenElement)
+ public function __invoke(ElementInterface $element = null, $labelPosition = null)
{
- $this->useHiddenElement = (bool) $useHiddenElement;
- return $this;
- }
+ if (!$element) {
+ return $this;
+ }
- /**
- * Returns the unchecked value used when "UseHiddenElement" is turned on.
- *
- * @return string
- */
- public function getUncheckedValue()
- {
- return $this->uncheckedValue;
- }
+ if ($labelPosition !== null) {
+ $this->setLabelPosition($labelPosition);
+ }
- /**
- * Sets the unchecked value used when "UseHiddenElement" is turned on.
- *
- * @param bool $value
- * @return FormMultiCheckbox
- */
- public function setUncheckedValue($value)
- {
- $this->uncheckedValue = $value;
- return $this;
+ return $this->render($element);
}
/**
@@ -226,14 +138,14 @@ class FormMultiCheckbox extends FormInput
/**
* Render options
*
- * @param MultiCheckboxElement $element
- * @param array $options
- * @param array $selectedOptions
- * @param array $attributes
+ * @param MultiCheckboxElement $element
+ * @param array $options
+ * @param array $selectedOptions
+ * @param array $attributes
* @return string
*/
protected function renderOptions(MultiCheckboxElement $element, array $options, array $selectedOptions,
- array $attributes)
+ array $attributes)
{
$escapeHtmlHelper = $this->getEscapeHtmlHelper();
$labelHelper = $this->getLabelHelper();
@@ -341,8 +253,8 @@ class FormMultiCheckbox extends FormInput
$closingBracket = $this->getInlineClosingBracket();
$uncheckedValue = $element->getUncheckedValue()
- ? $element->getUncheckedValue()
- : $this->uncheckedValue;
+ ? $element->getUncheckedValue()
+ : $this->uncheckedValue;
$hiddenAttributes = array(
'name' => $element->getName(),
@@ -357,25 +269,127 @@ class FormMultiCheckbox extends FormInput
}
/**
- * Invoke helper as functor
+ * Sets the attributes applied to option label.
*
- * Proxies to {@link render()}.
+ * @param array|null $attributes
+ * @return FormMultiCheckbox
+ */
+ public function setLabelAttributes($attributes)
+ {
+ $this->labelAttributes = $attributes;
+ return $this;
+ }
+
+ /**
+ * Returns the attributes applied to each option label.
*
- * @param ElementInterface|null $element
- * @param null|string $labelPosition
- * @return string|FormMultiCheckbox
+ * @return array|null
*/
- public function __invoke(ElementInterface $element = null, $labelPosition = null)
+ public function getLabelAttributes()
{
- if (!$element) {
- return $this;
- }
+ return $this->labelAttributes;
+ }
- if ($labelPosition !== null) {
- $this->setLabelPosition($labelPosition);
+ /**
+ * Set value for labelPosition
+ *
+ * @param mixed $labelPosition
+ * @throws Exception\InvalidArgumentException
+ * @return FormMultiCheckbox
+ */
+ public function setLabelPosition($labelPosition)
+ {
+ $labelPosition = strtolower($labelPosition);
+ if (!in_array($labelPosition, array(self::LABEL_APPEND, self::LABEL_PREPEND))) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects either %s::LABEL_APPEND or %s::LABEL_PREPEND; received "%s"',
+ __METHOD__,
+ __CLASS__,
+ __CLASS__,
+ (string) $labelPosition
+ ));
}
+ $this->labelPosition = $labelPosition;
- return $this->render($element);
+ return $this;
+ }
+
+ /**
+ * Get position of label
+ *
+ * @return string
+ */
+ public function getLabelPosition()
+ {
+ return $this->labelPosition;
+ }
+
+ /**
+ * Set separator string for checkbox elements
+ *
+ * @param string $separator
+ * @return FormMultiCheckbox
+ */
+ public function setSeparator($separator)
+ {
+ $this->separator = (string) $separator;
+ return $this;
+ }
+
+ /**
+ * Get separator for checkbox elements
+ *
+ * @return string
+ */
+ public function getSeparator()
+ {
+ return $this->separator;
+ }
+
+ /**
+ * Sets the option for prefixing the element with a hidden element
+ * for the unset value.
+ *
+ * @param bool $useHiddenElement
+ * @return FormMultiCheckbox
+ */
+ public function setUseHiddenElement($useHiddenElement)
+ {
+ $this->useHiddenElement = (bool) $useHiddenElement;
+ return $this;
+ }
+
+ /**
+ * Returns the option for prefixing the element with a hidden element
+ * for the unset value.
+ *
+ * @return bool
+ */
+ public function getUseHiddenElement()
+ {
+ return $this->useHiddenElement;
+ }
+
+ /**
+ * Sets the unchecked value used when "UseHiddenElement" is turned on.
+ *
+ * @param bool $value
+ * @return FormMultiCheckbox
+ */
+ public function setUncheckedValue($value)
+ {
+ $this->uncheckedValue = $value;
+ return $this;
+ }
+
+ /**
+ * Returns the unchecked value used when "UseHiddenElement" is turned on.
+ *
+ * @return string
+ */
+ public function getUncheckedValue()
+ {
+ return $this->uncheckedValue;
}
/**
@@ -388,6 +402,25 @@ class FormMultiCheckbox extends FormInput
return 'checkbox';
}
+ /**
+ * Get element name
+ *
+ * @param ElementInterface $element
+ * @throws Exception\DomainException
+ * @return string
+ */
+ protected static function getName(ElementInterface $element)
+ {
+ $name = $element->getName();
+ if ($name === null || $name === '') {
+ throw new Exception\DomainException(sprintf(
+ '%s requires that the element has an assigned name; none discovered',
+ __METHOD__
+ ));
+ }
+ return $name . '[]';
+ }
+
/**
* Retrieve the FormInput helper
*
@@ -431,23 +464,4 @@ class FormMultiCheckbox extends FormInput
return $this->labelHelper;
}
-
- /**
- * Get element name
- *
- * @param ElementInterface $element
- * @throws Exception\DomainException
- * @return string
- */
- protected static function getName(ElementInterface $element)
- {
- $name = $element->getName();
- if ($name === null || $name === '') {
- throw new Exception\DomainException(sprintf(
- '%s requires that the element has an assigned name; none discovered',
- __METHOD__
- ));
- }
- return $name . '[]';
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
index 43c787713f7a7ccf1b832c8f28a604c63ddff21a..2f66e5afd8a8b854228cfb7f00d9443d94879e71 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
@@ -19,47 +19,98 @@ class FormRow extends AbstractHelper
const LABEL_PREPEND = 'prepend';
/**
+ * The class that is added to element that have errors
+ *
* @var string
*/
- protected $labelPosition = self::LABEL_PREPEND;
-
- /**
- * @var bool
- */
- protected $renderErrors = true;
+ protected $inputErrorClass = 'input-error';
/**
+ * The attributes for the row label
+ *
* @var array
*/
protected $labelAttributes;
/**
+ * Where will be label rendered?
+ *
* @var string
*/
- protected $inputErrorClass = 'input-error';
+ protected $labelPosition = self::LABEL_PREPEND;
+
+ /**
+ * Are the errors are rendered by this helper?
+ *
+ * @var bool
+ */
+ protected $renderErrors = true;
/**
+ * Form label helper instance
+ *
* @var FormLabel
*/
protected $labelHelper;
/**
+ * Form element helper instance
+ *
* @var FormElement
*/
protected $elementHelper;
/**
+ * Form element errors helper instance
+ *
* @var FormElementErrors
*/
protected $elementErrorsHelper;
+ /**
+ * @var string
+ */
+ protected $partial;
+
+ /**
+ * Invoke helper as functor
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param null|ElementInterface $element
+ * @param null|string $labelPosition
+ * @param bool $renderErrors
+ * @return string|FormRow
+ */
+ public function __invoke(ElementInterface $element = null, $labelPosition = null, $renderErrors = null, $partial = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ if ($labelPosition !== null) {
+ $this->setLabelPosition($labelPosition);
+ } else {
+ $this->setLabelPosition(self::LABEL_PREPEND);
+ }
+
+ if ($renderErrors !== null) {
+ $this->setRenderErrors($renderErrors);
+ }
+
+ if ($partial !== null) {
+ $this->setPartial($partial);
+ }
+
+ return $this->render($element);
+ }
/**
* Utility form helper that renders a label (if it exists), an element and errors
*
- * @param ElementInterface $element
- * @return string
+ * @param ElementInterface $element
* @throws \Zend\Form\Exception\DomainException
+ * @return string
*/
public function render(ElementInterface $element)
{
@@ -70,26 +121,43 @@ class FormRow extends AbstractHelper
$label = $element->getLabel();
$inputErrorClass = $this->getInputErrorClass();
- $elementErrors = $elementErrorsHelper->render($element);
+
+ if (isset($label) && '' !== $label) {
+ // Translate the label
+ if (null !== ($translator = $this->getTranslator())) {
+ $label = $translator->translate(
+ $label, $this->getTranslatorTextDomain()
+ );
+ }
+ }
// Does this element have errors ?
- if (!empty($elementErrors) && !empty($inputErrorClass)) {
+ if (count($element->getMessages()) > 0 && !empty($inputErrorClass)) {
$classAttributes = ($element->hasAttribute('class') ? $element->getAttribute('class') . ' ' : '');
$classAttributes = $classAttributes . $inputErrorClass;
$element->setAttribute('class', $classAttributes);
}
+ if ($this->partial) {
+ $vars = array(
+ 'element' => $element,
+ 'label' => $label,
+ 'labelAttributes' => $this->labelAttributes,
+ 'labelPosition' => $this->labelPosition,
+ 'renderErrors' => $this->renderErrors,
+ );
+
+ return $this->view->render($this->partial, $vars);
+ }
+
+ if ($this->renderErrors) {
+ $elementErrors = $elementErrorsHelper->render($element);
+ }
+
$elementString = $elementHelper->render($element);
if (isset($label) && '' !== $label) {
- // Translate the label
- if (null !== ($translator = $this->getTranslator())) {
- $label = $translator->translate(
- $label, $this->getTranslatorTextDomain()
- );
- }
-
$label = $escapeHtmlHelper($label);
$labelAttributes = $element->getLabelAttributes();
@@ -145,40 +213,55 @@ class FormRow extends AbstractHelper
}
/**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
+ * Set the class that is added to element that have errors
*
- * @param null|ElementInterface $element
- * @param null|string $labelPosition
- * @param bool $renderErrors
- * @return string|FormRow
+ * @param string $inputErrorClass
+ * @return FormRow
*/
- public function __invoke(ElementInterface $element = null, $labelPosition = null, $renderErrors = null)
+ public function setInputErrorClass($inputErrorClass)
{
- if (!$element) {
- return $this;
- }
+ $this->inputErrorClass = $inputErrorClass;
+ return $this;
+ }
- if ($labelPosition !== null) {
- $this->setLabelPosition($labelPosition);
- } else {
- $this->setLabelPosition(self::LABEL_PREPEND);
- }
+ /**
+ * Get the class that is added to element that have errors
+ *
+ * @return string
+ */
+ public function getInputErrorClass()
+ {
+ return $this->inputErrorClass;
+ }
- if ($renderErrors !== null){
- $this->setRenderErrors($renderErrors);
- }
+ /**
+ * Set the attributes for the row label
+ *
+ * @param array $labelAttributes
+ * @return FormRow
+ */
+ public function setLabelAttributes($labelAttributes)
+ {
+ $this->labelAttributes = $labelAttributes;
+ return $this;
+ }
- return $this->render($element);
+ /**
+ * Get the attributes for the row label
+ *
+ * @return array
+ */
+ public function getLabelAttributes()
+ {
+ return $this->labelAttributes;
}
/**
* Set the label position
*
- * @param $labelPosition
- * @return FormRow
+ * @param string $labelPosition
* @throws \Zend\Form\Exception\InvalidArgumentException
+ * @return FormRow
*/
public function setLabelPosition($labelPosition)
{
@@ -208,7 +291,7 @@ class FormRow extends AbstractHelper
}
/**
- * Are the errors rendered by this helper ?
+ * Set if the errors are rendered by this helper
*
* @param bool $renderErrors
* @return FormRow
@@ -220,6 +303,8 @@ class FormRow extends AbstractHelper
}
/**
+ * Retrive if the errors are rendered by this helper
+ *
* @return bool
*/
public function getRenderErrors()
@@ -228,47 +313,25 @@ class FormRow extends AbstractHelper
}
/**
- * Set the attributes for the row label
+ * Set a partial view script to use for rendering the row
*
- * @param array $labelAttributes
+ * @param null|string $partial
* @return FormRow
*/
- public function setLabelAttributes($labelAttributes)
+ public function setPartial($partial)
{
- $this->labelAttributes = $labelAttributes;
+ $this->partial = $partial;
return $this;
}
/**
- * Get the attributes for the row label
+ * Retrive current partial
*
- * @return array
+ * @return null|string
*/
- public function getLabelAttributes()
+ public function getPartial()
{
- return $this->labelAttributes;
- }
-
- /**
- * Set the class that is added to element that have errors
- *
- * @param string $inputErrorClass
- * @return FormRow
- */
- public function setInputErrorClass($inputErrorClass)
- {
- $this->inputErrorClass = $inputErrorClass;
- return $this;
- }
-
- /**
- * Get the class that is added to element that have errors
- *
- * @return string
- */
- public function getInputErrorClass()
- {
- return $this->inputErrorClass;
+ return $this->partial;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
index a5a4120e760daaa51a0cfc860a308cb9ba21c172..962dc69cc58197bcea9fce3d500d7313f0a1cc8a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
@@ -25,6 +25,11 @@ class FormSelect extends AbstractHelper
*/
protected $validTagAttributes;
+ /**
+ * Attributes valid for select
+ *
+ * @var array
+ */
protected $validSelectAttributes = array(
'name' => true,
'autofocus' => true,
@@ -35,6 +40,11 @@ class FormSelect extends AbstractHelper
'size' => true
);
+ /**
+ * Attributes valid for options
+ *
+ * @var array
+ */
protected $validOptionAttributes = array(
'disabled' => true,
'selected' => true,
@@ -42,11 +52,37 @@ class FormSelect extends AbstractHelper
'value' => true,
);
+ /**
+ * Attributes valid for option groups
+ *
+ * @var array
+ */
protected $validOptgroupAttributes = array(
'disabled' => true,
'label' => true,
);
+ protected $translatableAttributes = array(
+ 'label' => true,
+ );
+
+ /**
+ * Invoke helper as functor
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface|null $element
+ * @return string|FormSelect
+ */
+ public function __invoke(ElementInterface $element = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element);
+ }
+
/**
* Render a form <select> element from the provided $element
*
@@ -160,6 +196,11 @@ class FormSelect extends AbstractHelper
}
$attributes = compact('value', 'selected', 'disabled');
+
+ if (isset($optionSpec['attributes']) && is_array($optionSpec['attributes'])) {
+ $attributes = array_merge($attributes, $optionSpec['attributes']);
+ }
+
$this->validTagAttributes = $this->validOptionAttributes;
$optionStrings[] = sprintf(
$template,
@@ -205,23 +246,6 @@ class FormSelect extends AbstractHelper
);
}
- /**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface|null $element
- * @return string|FormSelect
- */
- public function __invoke(ElementInterface $element = null)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element);
- }
-
/**
* Ensure that the value is set appropriately
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php
index 59d5debf2366482d36cecdf5527436f367407878..e5bf832ee7abedd734fa5f3a2d3c948b8906b860 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php
@@ -34,6 +34,23 @@ class FormTextarea extends AbstractHelper
'wrap' => true,
);
+ /**
+ * Invoke helper as functor
+ *
+ * Proxies to {@link render()}.
+ *
+ * @param ElementInterface|null $element
+ * @return string|FormTextarea
+ */
+ public function __invoke(ElementInterface $element = null)
+ {
+ if (!$element) {
+ return $this;
+ }
+
+ return $this->render($element);
+ }
+
/**
* Render a form <textarea> element from the provided $element
*
@@ -62,21 +79,4 @@ class FormTextarea extends AbstractHelper
$escapeHtml($content)
);
}
-
- /**
- * Invoke helper as functor
- *
- * Proxies to {@link render()}.
- *
- * @param ElementInterface|null $element
- * @return string|FormTextarea
- */
- public function __invoke(ElementInterface $element = null)
- {
- if (!$element) {
- return $this;
- }
-
- return $this->render($element);
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php b/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php
index 1739aa8315a58abec1c911d87c5c6de8d455830d..95d49d58f9e3449587dc984791ba01cb583639ad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php
@@ -18,7 +18,9 @@ use Zend\ServiceManager\ServiceManager;
class HelperConfig implements ConfigInterface
{
/**
- * @var array Pre-aliased view helpers
+ * Pre-aliased view helpers
+ *
+ * @var array
*/
protected $invokables = array(
'form' => 'Zend\Form\View\Helper\Form',
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/composer.json b/vendor/zendframework/zendframework/library/Zend/Form/composer.json
index 3bc8941e61e78ceee8973fc191bedc41432b58af..0c8e5a7f4b7123bc70bd7a8e834a7f9367261665 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Form/composer.json
@@ -25,8 +25,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client.php b/vendor/zendframework/zendframework/library/Zend/Http/Client.php
index ce76e1eb07ae54193586779dd71bd6059879b2b5..6af9539b018b59fe49b632e6509d9a0f99240edc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client.php
@@ -282,7 +282,7 @@ class Client implements Stdlib\DispatchableInterface
/**
* Get the redirections count
*
- * @return integer
+ * @return int
*/
public function getRedirectionsCount()
{
@@ -298,8 +298,18 @@ class Client implements Stdlib\DispatchableInterface
public function setUri($uri)
{
if (!empty($uri)) {
+ // remember host of last request
+ $lastHost = $this->getRequest()->getUri()->getHost();
$this->getRequest()->setUri($uri);
+ // if host changed, the HTTP authentication should be cleared for security
+ // reasons, see #4215 for a discussion - currently authentication is also
+ // cleared for peer subdomains due to technical limits
+ $nextHost = $this->getRequest()->getUri()->getHost();
+ if (!preg_match('/' . preg_quote($lastHost, '/') . '$/i', $nextHost)) {
+ $this->clearAuth();
+ }
+
// Set auth if username and password has been specified in the uri
if ($this->getUri()->getUser() && $this->getUri()->getPassword()) {
$this->setAuth($this->getUri()->getUser(), $this->getUri()->getPassword());
@@ -444,6 +454,42 @@ class Client implements Stdlib\DispatchableInterface
return $this;
}
+ /**
+ * Reset all the HTTP parameters (request, response, etc)
+ *
+ * @param bool $clearCookies Also clear all valid cookies? (defaults to false)
+ * @param bool $clearAuth Also clear http authentication? (defaults to true)
+ * @return Client
+ */
+ public function resetParameters($clearCookies = false /*, $clearAuth = true */)
+ {
+ $clearAuth = true;
+ if (func_num_args() > 1) {
+ $clearAuth = func_get_arg(1);
+ }
+
+ $uri = $this->getUri();
+
+ $this->streamName = null;
+ $this->encType = null;
+ $this->request = null;
+ $this->response = null;
+ $this->lastRawRequest = null;
+ $this->lastRawResponse = null;
+
+ $this->setUri($uri);
+
+ if ($clearCookies) {
+ $this->clearCookies();
+ }
+
+ if ($clearAuth) {
+ $this->clearAuth();
+ }
+
+ return $this;
+ }
+
/**
* Return the current cookies
*
@@ -673,6 +719,14 @@ class Client implements Stdlib\DispatchableInterface
return $this;
}
+ /**
+ * Clear http authentication
+ */
+ public function clearAuth()
+ {
+ $this->auth = array();
+ }
+
/**
* Calculate the response value according to the HTTP authentication type
*
@@ -728,31 +782,6 @@ class Client implements Stdlib\DispatchableInterface
return $response;
}
- /**
- * Reset all the HTTP parameters (auth,cookies,request, response, etc)
- *
- * @param bool $clearCookies Also clear all valid cookies? (defaults to false)
- * @return Client
- */
- public function resetParameters($clearCookies = false)
- {
- $uri = $this->getUri();
-
- $this->auth = null;
- $this->streamName = null;
- $this->encType = null;
- $this->request = null;
- $this->response = null;
-
- $this->setUri($uri);
-
- if ($clearCookies) {
- $this->clearCookies();
- }
-
- return $this;
- }
-
/**
* Dispatch
*
@@ -897,13 +926,15 @@ class Client implements Stdlib\DispatchableInterface
((! $this->config['strictredirects']) && ($response->getStatusCode() == 302 ||
$response->getStatusCode() == 301))) {
- $this->resetParameters();
+ $this->resetParameters(false, false);
$this->setMethod(Request::METHOD_GET);
}
+
// If we got a well formed absolute URI
if (($scheme = substr($location, 0, 6)) &&
($scheme == 'http:/' || $scheme == 'https:')) {
+ // setURI() clears parameters if host changed, see #4215
$this->setUri($location);
} else {
@@ -933,12 +964,26 @@ class Client implements Stdlib\DispatchableInterface
break;
}
- } while ($this->redirectCounter < $this->config['maxredirects']);
+ } while ($this->redirectCounter <= $this->config['maxredirects']);
$this->response = $response;
return $response;
}
+ /**
+ * Fully reset the HTTP client (auth, cookies, request, response, etc.)
+ *
+ * @return Client
+ */
+ public function reset()
+ {
+ $this->resetParameters();
+ $this->clearAuth();
+ $this->clearCookies();
+
+ return $this;
+ }
+
/**
* Set a file to upload (using a POST request)
*
@@ -1004,7 +1049,7 @@ class Client implements Stdlib\DispatchableInterface
*
* @param string $domain
* @param string $path
- * @param boolean $secure
+ * @param bool $secure
* @return Header\Cookie|bool
*/
protected function prepareCookies($domain, $path, $secure)
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
index f06aa866db77de75f35a37bdb8f2573c142140ed..c5a11078df6781b9b1c822463b7ef927a8b98f7d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
@@ -192,7 +192,7 @@ class Proxy extends Socket
* Preform handshaking with HTTPS proxy using CONNECT method
*
* @param string $host
- * @param integer $port
+ * @param int $port
* @param string $httpVer
* @param array $headers
* @throws AdapterException\RuntimeException
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
index 7e3d407de1150d021193cd09210913d81362e45f..7ccd62541c33f5f66fc45a04651dc8aaa5356299 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
@@ -41,7 +41,7 @@ class Test implements AdapterInterface
/**
* Current position in the response buffer
*
- * @var integer
+ * @var int
*/
protected $responseIndex = 0;
@@ -199,7 +199,7 @@ class Test implements AdapterInterface
* Sets the position of the response buffer. Selects which
* response will be returned on the next call to read().
*
- * @param integer $index
+ * @param int $index
* @throws Exception\OutOfRangeException
*/
public function setResponseIndex($index)
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php b/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
index dfde5e2d4ae8f78f98914867997a0f03c90074b3..970a0733c3c24470f73be165be34b0af4b62f964 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
@@ -60,7 +60,7 @@ class ClientStatic
}
if (!empty($body)) {
- $request->setBody($body);
+ $request->setContent($body);
}
return static::getStaticClient()->send($request);
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php
index ed518b277cac4f6ae0bb708030a9c8bc264c955f..23be958e452dbb51112ffde328288427ec7b4299 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php
@@ -419,7 +419,7 @@ abstract class AbstractAccept implements HeaderInterface
}
// Asterisks
- $values = array('type', 'subtype','format');
+ $values = array('type', 'subtype', 'format');
foreach ($values as $value) {
if ($a->$value == '*' && $b->$value != '*') {
return 1;
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
index 8898a39ac4d24d0c40655de21be842016b931e38..9aa6151321a3033e69161796f9f628281c1fe2be 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
@@ -10,9 +10,9 @@
namespace Zend\Http\Header;
use Zend\Uri\Exception as UriException;
-use Zend\Uri\UriInterface;
-use Zend\Uri\UriFactory;
use Zend\Uri\Uri;
+use Zend\Uri\UriFactory;
+use Zend\Uri\UriInterface;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
index 220a507acc15d3129e5f621d4e4e53699c4c1eb3..4fd163c5a73bc2082d0f56bbd3d247f3b2c0aa96 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
@@ -8,8 +8,8 @@
*/
namespace Zend\Http\Header;
-use Zend\Http\Header\Accept\FieldValuePart;
+use Zend\Http\Header\Accept\FieldValuePart;
/**
* Accept Header
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php
index 1b7755d19741f91b252dad2db30d3f6c93aa88d6..b4f76b96bfef1d97fa86c77e7b0e8cb7318c510c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php
@@ -8,6 +8,7 @@
*/
namespace Zend\Http\Header;
+
use Zend\Http\Header\Accept\FieldValuePart;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php
index b05733da7f4d6a90a1f067063d3d6495ac223e14..be17348aa86f650224dc94d065a761a5f8233755 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php
@@ -8,6 +8,7 @@
*/
namespace Zend\Http\Header;
+
use Zend\Http\Header\Accept\FieldValuePart;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php
index 4b953d2b39a6d7c0042f9a7b016b9a3c70cd5f33..a131ad246856228608d2edbf8185d3e948f422df 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php
@@ -8,8 +8,8 @@
*/
namespace Zend\Http\Header;
-use Zend\Http\Header\Accept\FieldValuePart;
+use Zend\Http\Header\Accept\FieldValuePart;
/**
* Accept Language Header
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
index 4c24fdc6962b23ebc7b556e00f0fc9b6ce8aa648..093be4ed066751ae586eea8e5e002d0fd2c2fa1d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
@@ -37,14 +37,14 @@ class SetCookie implements MultipleHeaderInterface
/**
* Version
*
- * @var integer
+ * @var int
*/
protected $version = null;
/**
* Max Age
*
- * @var integer
+ * @var int
*/
protected $maxAge = null;
@@ -317,7 +317,7 @@ class SetCookie implements MultipleHeaderInterface
/**
* Set version
*
- * @param integer $version
+ * @param int $version
* @throws Exception\InvalidArgumentException
*/
public function setVersion($version)
@@ -331,7 +331,7 @@ class SetCookie implements MultipleHeaderInterface
/**
* Get version
*
- * @return integer
+ * @return int
*/
public function getVersion()
{
@@ -341,7 +341,7 @@ class SetCookie implements MultipleHeaderInterface
/**
* Set Max-Age
*
- * @param integer $maxAge
+ * @param int $maxAge
* @throws Exception\InvalidArgumentException
*/
public function setMaxAge($maxAge)
@@ -355,7 +355,7 @@ class SetCookie implements MultipleHeaderInterface
/**
* Get Max-Age
*
- * @return integer
+ * @return int
*/
public function getMaxAge()
{
@@ -512,9 +512,9 @@ class SetCookie implements MultipleHeaderInterface
* Checks whether the cookie should be sent or not in a specific scenario
*
* @param string|Zend\Uri\Uri $uri URI to check against (secure, domain, path)
- * @param boolean $matchSessionCookies Whether to send session cookies
+ * @param bool $matchSessionCookies Whether to send session cookies
* @param int $now Override the current time when checking for expiry time
- * @return boolean
+ * @return bool
*/
public function match($uri, $matchSessionCookies = true, $now = null)
{
@@ -554,7 +554,7 @@ class SetCookie implements MultipleHeaderInterface
* @param string $cookieDomain
* @param string $host
*
- * @return boolean
+ * @return bool
*/
public static function matchCookieDomain($cookieDomain, $host)
{
@@ -580,7 +580,7 @@ class SetCookie implements MultipleHeaderInterface
*
* @param string $cookiePath
* @param string $path
- * @return boolean
+ * @return bool
*/
public static function matchCookiePath($cookiePath, $path)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Response.php b/vendor/zendframework/zendframework/library/Zend/Http/Response.php
index dc5d08885f58a67d73d415c061b118e020855a03..f6b99cfd9cdde254c1df66e8a3b71be1f79442c9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Response.php
@@ -233,7 +233,7 @@ class Response extends AbstractMessage implements ResponseInterface
/**
* Set HTTP status code and (optionally) message
*
- * @param integer $code
+ * @param int $code
* @throws Exception\InvalidArgumentException
* @return Response
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/composer.json b/vendor/zendframework/zendframework/library/Zend/Http/composer.json
index d4017f0cc370e20626874c9e494db662a693a45a..cfb5416e026e690e72da8772d0cc6b00a12d22a0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Http/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..39bb5a90501e0dff51a881be1b3e35d44f4d4872
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\I18n\Exception;
+
+use DomainException;
+
+class ExtensionNotLoadedException extends DomainException implements
+ ExceptionInterface
+{}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php
index 864d6bdcb2982bb81f0330134ca1ec3b65097256..0e5d262877a8fe6818e4eeb37dbc6d91386930ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php
@@ -11,9 +11,23 @@ namespace Zend\I18n\Filter;
use Locale;
use Zend\Filter\AbstractFilter;
+use Zend\I18n\Exception;
abstract class AbstractLocale extends AbstractFilter
{
+ /**
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+ */
+ public function __construct()
+ {
+ if (!extension_loaded('intl')) {
+ throw new Exception\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+ }
+
/**
* Sets the locale option
*
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php
index e6ebfef23fc4cb0a1e655fbfd9f8c656086c9012..8eb3108300850f97bf3ca5b67a3ec2bca0477e81 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php
@@ -30,6 +30,7 @@ class Alnum extends AbstractLocale
*/
public function __construct($allowWhiteSpaceOrOptions = null, $locale = null)
{
+ parent::__construct();
if ($allowWhiteSpaceOrOptions !== null) {
if (static::isOptions($allowWhiteSpaceOrOptions)) {
$this->setOptions($allowWhiteSpaceOrOptions);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
index 21a82ddd0c3ee1b013e181b510bae1a12a09d238..7c62679076591472700c68fe3c238d561a695a6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
@@ -37,6 +37,7 @@ class NumberFormat extends AbstractLocale
$style = NumberFormatter::DEFAULT_STYLE,
$type = NumberFormatter::TYPE_DOUBLE)
{
+ parent::__construct();
if ($localeOrOptions !== null) {
if ($localeOrOptions instanceof Traversable) {
$localeOrOptions = iterator_to_array($localeOrOptions);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php
index 176cce565e9f47ccf3585fae83baa92ac20c3b3d..ca156526680de5dbd6899676651d8b05c9c965af 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php
@@ -158,7 +158,7 @@ class Gettext implements FileLoaderInterface
/**
* Read a single integer from the current file.
*
- * @return integer
+ * @return int
*/
protected function readInteger()
{
@@ -174,8 +174,8 @@ class Gettext implements FileLoaderInterface
/**
* Read an integer from the current file.
*
- * @param integer $num
- * @return integer
+ * @param int $num
+ * @return int
*/
protected function readIntegerList($num)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php
index d3394033f96e5c46e66536ceb564d7002ebfc35b..2929b56c3b6bf70e2f66a55dbe4132dcfdc039c7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php
@@ -29,7 +29,7 @@ class Parser
/**
* Current lexer position in the string.
*
- * @var integer
+ * @var int
*/
protected $currentPos;
@@ -131,7 +131,7 @@ class Parser
* Register a left infix symbol.
*
* @param string $id
- * @param integer $leftBindingPower
+ * @param int $leftBindingPower
* @return void
*/
protected function registerLeftInfixSymbol($id, $leftBindingPower)
@@ -149,7 +149,7 @@ class Parser
* Register a right infix symbol.
*
* @param string $id
- * @param integer $leftBindingPower
+ * @param int $leftBindingPower
* @return void
*/
protected function registerRightInfixSymbol($id, $leftBindingPower)
@@ -167,7 +167,7 @@ class Parser
* Register a prefix symbol.
*
* @param string $id
- * @param integer $leftBindingPower
+ * @param int $leftBindingPower
* @return void
*/
protected function registerPrefixSymbol($id, $leftBindingPower)
@@ -185,7 +185,7 @@ class Parser
* Register a symbol.
*
* @param string $id
- * @param integer $leftBindingPower
+ * @param int $leftBindingPower
* @return Symbol
*/
protected function registerSymbol($id, $leftBindingPower = 0)
@@ -236,7 +236,7 @@ class Parser
/**
* Parse an expression.
*
- * @param integer $rightBindingPower
+ * @param int $rightBindingPower
* @return Symbol
*/
public function expression($rightBindingPower = 0)
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php
index ffe3a66d79eb15e8f798af44a5ac328677e8fe22..39f2aa150540348cb0a928108aea8c0ca666892c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php
@@ -33,14 +33,14 @@ class Rule
/**
* Number of plurals in this rule.
*
- * @var integer
+ * @var int
*/
protected $numPlurals;
/**
* Create a new plural rule.
*
- * @param integer $numPlurals
+ * @param int $numPlurals
* @param array $ast
* @return Rule
*/
@@ -53,8 +53,8 @@ class Rule
/**
* Evaluate a number and return the plural index.
*
- * @param integer $number
- * @return integer
+ * @param int $number
+ * @return int
* @throws Exception\RangeException
*/
public function evaluate($number)
@@ -74,7 +74,7 @@ class Rule
/**
* Get number of possible plural forms.
*
- * @return integer
+ * @return int
*/
public function getNumPlurals()
{
@@ -85,8 +85,8 @@ class Rule
* Evaluate a part of an ast.
*
* @param array $ast
- * @param integer $number
- * @return integer
+ * @param int $number
+ * @return int
* @throws Exception\ParseException
*/
protected function evaluateAstPart(array $ast, $number)
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php
index ffc206a7478aba937e4ff2b8b9739f6615e1b500..d5e2b3c1145b011ce2ae7c97e5098ced8957b517 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php
@@ -39,7 +39,7 @@ class Symbol
/**
* Left binding power (precedence).
*
- * @var integer
+ * @var int
*/
public $leftBindingPower;
@@ -90,7 +90,7 @@ class Symbol
*
* @param Parser $parser
* @param string $id
- * @param integer $leftBindingPower
+ * @param int $leftBindingPower
*/
public function __construct(Parser $parser, $id, $leftBindingPower)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php
index e0212b43ec7c6d0e57ed362055bfbed2be0a26ae..5b2c1566dbfd75f0cd5c0f15d5432c941fe04472 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php
@@ -13,6 +13,8 @@ use Locale;
use Traversable;
use Zend\Cache;
use Zend\Cache\Storage\StorageInterface as CacheStorage;
+use Zend\EventManager\EventManager;
+use Zend\EventManager\EventManagerInterface;
use Zend\I18n\Exception;
use Zend\I18n\Translator\Loader\FileLoaderInterface;
use Zend\I18n\Translator\Loader\RemoteLoaderInterface;
@@ -23,6 +25,16 @@ use Zend\Stdlib\ArrayUtils;
*/
class Translator
{
+ /**
+ * Event fired when the translation for a message is missing.
+ */
+ const EVENT_MISSING_TRANSLATION = 'missingTranslation';
+
+ /**
+ * Event fired when no messages were loaded for a locale/text-domain combination.
+ */
+ const EVENT_NO_MESSAGES_LOADED = 'noMessagesLoaded';
+
/**
* Messages loaded by the translator.
*
@@ -79,6 +91,20 @@ class Translator
*/
protected $pluginManager;
+ /**
+ * Event manager for triggering translator events.
+ *
+ * @var EventManagerInterface
+ */
+ protected $events;
+
+ /**
+ * Whether events are enabled
+ *
+ * @var bool
+ */
+ protected $eventsEnabled = false;
+
/**
* Instantiate a translator
*
@@ -197,6 +223,11 @@ class Translator
}
}
+ // event manager enabled
+ if (isset($options['event_manager_enabled']) && $options['event_manager_enabled']) {
+ $translator->enableEventManager();
+ }
+
return $translator;
}
@@ -217,10 +248,17 @@ class Translator
* Get the default locale.
*
* @return string
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present and no locale set
*/
public function getLocale()
{
if ($this->locale === null) {
+ if (!extension_loaded('intl')) {
+ throw new Exception\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
$this->locale = Locale::getDefault();
}
@@ -381,14 +419,15 @@ class Translator
/**
* Get a translated message.
*
- * @param string $message
- * @param string $locale
- * @param string $textDomain
- * @return string|null
+ * @triggers getTranslatedMessage.missing-translation
+ * @param string $message
+ * @param string $locale
+ * @param string $textDomain
+ * @return string|null
*/
protected function getTranslatedMessage(
$message,
- $locale = null,
+ $locale,
$textDomain = 'default'
) {
if ($message === '') {
@@ -403,6 +442,25 @@ class Translator
return $this->messages[$textDomain][$locale][$message];
}
+ if ($this->isEventManagerEnabled()) {
+ $results = $this->getEventManager()->trigger(
+ self::EVENT_MISSING_TRANSLATION,
+ $this,
+ array(
+ 'message' => $message,
+ 'locale' => $locale,
+ 'text_domain' => $textDomain,
+ ),
+ function ($r) {
+ return is_string($r);
+ }
+ );
+ $last = $results->last();
+ if (is_string($last)) {
+ return $last;
+ }
+ }
+
return null;
}
@@ -484,10 +542,11 @@ class Translator
/**
* Load messages for a given language and domain.
*
- * @param string $textDomain
- * @param string $locale
- * @throws Exception\RuntimeException
- * @return void
+ * @triggers loadMessages.no-messages-loaded
+ * @param string $textDomain
+ * @param string $locale
+ * @throws Exception\RuntimeException
+ * @return void
*/
protected function loadMessages($textDomain, $locale)
{
@@ -511,8 +570,30 @@ class Translator
$messagesLoaded |= $this->loadMessagesFromFiles($textDomain, $locale);
if (!$messagesLoaded) {
- $this->messages[$textDomain][$locale] = null;
- } elseif ($cache !== null) {
+ $discoveredTextDomain = null;
+ if ($this->isEventManagerEnabled()) {
+ $results = $this->getEventManager()->trigger(
+ self::EVENT_NO_MESSAGES_LOADED,
+ $this,
+ array(
+ 'locale' => $locale,
+ 'text_domain' => $textDomain,
+ ),
+ function ($r) {
+ return ($r instanceof TextDomain);
+ }
+ );
+ $last = $results->last();
+ if ($last instanceof TextDomain) {
+ $discoveredTextDomain = $last;
+ }
+ }
+
+ $this->messages[$textDomain][$locale] = $discoveredTextDomain;
+ $messagesLoaded = true;
+ }
+
+ if ($messagesLoaded && $cache !== null) {
$cache->setItem($cacheId, $this->messages[$textDomain][$locale]);
}
}
@@ -522,7 +603,7 @@ class Translator
*
* @param string $textDomain
* @param string $locale
- * @return boolean
+ * @return bool
* @throws Exception\RuntimeException When specified loader is not a remote loader
*/
protected function loadMessagesFromRemote($textDomain, $locale)
@@ -555,7 +636,7 @@ class Translator
*
* @param string $textDomain
* @param string $locale
- * @return boolean
+ * @return bool
* @throws Exception\RuntimeException When specified loader is not a file loader
*/
protected function loadMessagesFromPatterns($textDomain, $locale)
@@ -592,7 +673,7 @@ class Translator
*
* @param string $textDomain
* @param string $locale
- * @return boolean
+ * @return bool
* @throws Exception\RuntimeException When specified loader is not a file loader
*/
protected function loadMessagesFromFiles($textDomain, $locale)
@@ -625,4 +706,67 @@ class Translator
return $messagesLoaded;
}
+
+ /**
+ * Get the event manager.
+ *
+ * @return EventManagerInterface|null
+ */
+ public function getEventManager()
+ {
+ if (!$this->events instanceof EventManagerInterface) {
+ $this->setEventManager(new EventManager());
+ }
+
+ return $this->events;
+ }
+
+ /**
+ * Set the event manager instance used by this translator.
+ *
+ * @param EventManagerInterface $events
+ * @return Translator
+ */
+ public function setEventManager(EventManagerInterface $events)
+ {
+ $events->setIdentifiers(array(
+ __CLASS__,
+ get_class($this),
+ 'translator',
+ ));
+ $this->events = $events;
+ return $this;
+ }
+
+ /**
+ * Check whether the event manager is enabled.
+ *
+ * @return boolean
+ */
+ public function isEventManagerEnabled()
+ {
+ return $this->eventsEnabled;
+ }
+
+ /**
+ * Enable the event manager.
+ *
+ * @return Translator
+ */
+ public function enableEventManager()
+ {
+ $this->eventsEnabled = true;
+ return $this;
+ }
+
+ /**
+ * Disable the event manager.
+ *
+ * @return Translator
+ */
+ public function disableEventManager()
+ {
+ $this->eventsEnabled = false;
+ return $this;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/DateTime.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/DateTime.php
new file mode 100644
index 0000000000000000000000000000000000000000..aa563950c6c5f072bfd745b5f3185a40fb912e7b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/DateTime.php
@@ -0,0 +1,310 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\I18n\Validator;
+
+use Locale;
+use IntlDateFormatter;
+use Traversable;
+use Zend\I18n\Exception as I18nException;
+use Zend\Validator\AbstractValidator;
+use Zend\Validator\Exception as ValidatorException;
+
+class DateTime extends AbstractValidator
+{
+ const INVALID = 'datetimeInvalid';
+ const INVALID_DATETIME = 'datetimeInvalidDateTime';
+
+ /**
+ * @var array
+ */
+ protected $messageTemplates = array(
+ self::INVALID => "Invalid type given. String expected",
+ self::INVALID_DATETIME => "The input does not appear to be a valid datetime",
+ );
+
+ /**
+ * Optional locale
+ *
+ * @var string|null
+ */
+ protected $locale;
+
+ /**
+ * @var int
+ */
+ protected $dateType;
+
+ /**
+ * @var int
+ */
+ protected $timeType;
+
+ /**
+ * Optional timezone
+ *
+ * @var string
+ */
+ protected $timezone;
+
+ /**
+ * @var string
+ */
+ protected $pattern;
+
+ /**
+ * @var int
+ */
+ protected $calendar;
+
+ /**
+ * @var IntlDateFormatter
+ */
+ protected $formatter;
+
+ /**
+ * Is the formatter invalidated
+ *
+ * Invalidation occurs when immutable properties are changed
+ *
+ * @var bool
+ */
+ protected $invalidateFormatter = false;
+
+ /**
+ * Constructor for the Date validator
+ *
+ * @param array|Traversable $options
+ * @throws I18nException\ExtensionNotLoadedException if ext/intl is not present
+ */
+ public function __construct($options = array())
+ {
+ if (!extension_loaded('intl')) {
+ throw new I18nException\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+
+ // Delaying initialization until we know ext/intl is available
+ $this->dateType = IntlDateFormatter::NONE;
+ $this->timeType = IntlDateFormatter::NONE;
+ $this->calendar = IntlDateFormatter::GREGORIAN;
+
+ parent::__construct($options);
+
+ if (null === $this->locale) {
+ $this->locale = Locale::getDefault();
+ }
+ if (null === $this->timezone) {
+ $this->timezone = date_default_timezone_get();
+ }
+ }
+
+ /**
+ * Sets the calendar to be used by the IntlDateFormatter
+ *
+ * @param int|null $calendar
+ * @return DateTime provides fluent interface
+ */
+ public function setCalendar($calendar)
+ {
+ $this->calendar = $calendar;
+
+ return $this;
+ }
+
+ /**
+ * Returns the calendar to by the IntlDateFormatter
+ *
+ * @return int
+ */
+ public function getCalendar()
+ {
+ return ($this->formatter && !$this->invalidateFormatter) ? $this->getIntlDateFormatter()->getCalendar() : $this->calendar;
+ }
+
+ /**
+ * Sets the date format to be used by the IntlDateFormatter
+ *
+ * @param int|null $dateType
+ * @return DateTime provides fluent interface
+ */
+ public function setDateType($dateType)
+ {
+ $this->dateType = $dateType;
+ $this->invalidateFormatter = true;
+
+ return $this;
+ }
+
+ /**
+ * Returns the date format used by the IntlDateFormatter
+ *
+ * @return int
+ */
+ public function getDateType()
+ {
+ return $this->dateType;
+ }
+
+ /**
+ * Sets the pattern to be used by the IntlDateFormatter
+ *
+ * @param string|null $pattern
+ * @return DateTime provides fluent interface
+ */
+ public function setPattern($pattern)
+ {
+ $this->pattern = $pattern;
+
+ return $this;
+ }
+
+ /**
+ * Returns the pattern used by the IntlDateFormatter
+ *
+ * @return string
+ */
+ public function getPattern()
+ {
+ return ($this->formatter && !$this->invalidateFormatter) ? $this->getIntlDateFormatter()->getPattern() : $this->pattern;
+ }
+
+ /**
+ * Sets the time format to be used by the IntlDateFormatter
+ *
+ * @param int|null $timeType
+ * @return DateTime provides fluent interface
+ */
+ public function setTimeType($timeType)
+ {
+ $this->timeType = $timeType;
+ $this->invalidateFormatter = true;
+
+ return $this;
+ }
+
+ /**
+ * Returns the time format used by the IntlDateFormatter
+ *
+ * @return int
+ */
+ public function getTimeType()
+ {
+ return $this->timeType;
+ }
+
+ /**
+ * Sets the timezone to be used by the IntlDateFormatter
+ *
+ * @param string|null $timezone
+ * @return DateTime provides fluent interface
+ */
+ public function setTimezone($timezone)
+ {
+ $this->timezone = $timezone;
+
+ return $this;
+ }
+
+ /**
+ * Returns the timezone used by the IntlDateFormatter or the system default if none given
+ *
+ * @return string
+ */
+ public function getTimezone()
+ {
+ return ($this->formatter && !$this->invalidateFormatter) ? $this->getIntlDateFormatter()->getTimeZoneId() : $this->timezone;
+ }
+
+ /**
+ * Sets the locale to be used by the IntlDateFormatter
+ *
+ * @param string|null $locale
+ * @return DateTime provides fluent interface
+ */
+ public function setLocale($locale)
+ {
+ $this->locale = $locale;
+ $this->invalidateFormatter = true;
+
+ return $this;
+ }
+
+ /**
+ * Returns the locale used by the IntlDateFormatter or the system default if none given
+ *
+ * @return string
+ */
+ public function getLocale()
+ {
+ return $this->locale;
+ }
+
+ /**
+ * Returns true if and only if $value is a floating-point value
+ *
+ * @param string $value
+ * @return bool
+ * @throws ValidatorException\InvalidArgumentException
+ */
+ public function isValid($value)
+ {
+ if (!is_string($value)) {
+ $this->error(self::INVALID);
+
+ return false;
+ }
+
+ $this->setValue($value);
+
+ $formatter = $this->getIntlDateFormatter();
+
+ if (intl_is_failure($formatter->getErrorCode())) {
+ throw new ValidatorException\InvalidArgumentException("Invalid locale string given");
+ }
+
+ $position = 0;
+ $parsedDate = $formatter->parse($value, $position);
+
+ if (intl_is_failure($formatter->getErrorCode())) {
+ $this->error(self::INVALID_DATETIME);
+
+ return false;
+ }
+
+ if ($position != strlen($value)) {
+ $this->error(self::INVALID_DATETIME);
+
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns a non lenient configured IntlDateFormatter
+ *
+ * @return IntlDateFormatter
+ */
+ protected function getIntlDateFormatter()
+ {
+ if ($this->formatter == null || $this->invalidateFormatter) {
+ $this->formatter = new IntlDateFormatter($this->getLocale(), $this->getDateType(), $this->getTimeType(),
+ $this->getTimezone(), $this->getCalendar(), $this->getPattern());
+
+ $this->formatter->setLenient(false);
+
+ $this->invalidateFormatter = false;
+ }
+
+ return $this->formatter;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php
index b1ae9131f18edfab637354861e5a62dd9933e564..dd1d4cd8419a688fa9758a582b7edbc0f411f340 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php
@@ -12,6 +12,7 @@ namespace Zend\I18n\Validator;
use Locale;
use NumberFormatter;
use Traversable;
+use Zend\I18n\Exception as I18nException;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception;
@@ -40,9 +41,17 @@ class Float extends AbstractValidator
* Constructor for the integer validator
*
* @param array|Traversable $options
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
*/
public function __construct($options = array())
{
+ if (!extension_loaded('intl')) {
+ throw new I18nException\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+
if ($options instanceof Traversable) {
$options = ArrayUtils::iteratorToArray($options);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php
index 968c881a2b52092a6c7bb709ad35f954d8ed1a1b..2c91a89f94d60c5b8376eefa5f698ccc25f103d0 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php
@@ -12,6 +12,7 @@ namespace Zend\I18n\Validator;
use Locale;
use NumberFormatter;
use Traversable;
+use Zend\I18n\Exception as I18nException;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception;
@@ -40,9 +41,17 @@ class Int extends AbstractValidator
* Constructor for the integer validator
*
* @param array|Traversable $options
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
*/
public function __construct($options = array())
{
+ if (!extension_loaded('intl')) {
+ throw new I18nException\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+
if ($options instanceof Traversable) {
$options = ArrayUtils::iteratorToArray($options);
}
@@ -80,7 +89,7 @@ class Int extends AbstractValidator
/**
* Returns true if and only if $value is a valid integer
*
- * @param string|integer $value
+ * @param string|int $value
* @return bool
* @throws Exception\InvalidArgumentException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
new file mode 100644
index 0000000000000000000000000000000000000000..e80e44271f56f2dc5d24cadfc507281e1b5e6e30
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\I18n\Validator;
+
+use Zend\Validator\AbstractValidator;
+
+class PhoneNumber extends AbstractValidator
+{
+
+ const NO_MATCH = 'phoneNumberNoMatch';
+ const UNSUPPORTED = 'phoneNumberUnsupported';
+ const INVALID = 'phoneNumberInvalid';
+
+ /**
+ * Validation failure message template definitions
+ *
+ * @var array
+ */
+ protected $messageTemplates = array(
+ self::NO_MATCH => 'The input does not match a phone number format',
+ self::UNSUPPORTED => 'The country provided is currently unsupported',
+ self::INVALID => 'Invalid type given. String expected',
+ );
+
+ /**
+ * Phone Number Patterns
+ *
+ * @link http://libphonenumber.googlecode.com/svn/trunk/resources/PhoneNumberMetaData.xml
+ * @var array
+ */
+ protected static $phone = array();
+
+ /**
+ * ISO 3611 Country Code
+ *
+ * @var string
+ */
+ protected $country;
+
+ /**
+ * Allow Possible Matches
+ *
+ * @var bool
+ */
+ protected $allowPossible = false;
+
+ /**
+ * Allowed Types
+ *
+ * @var array
+ */
+ protected $allowedTypes = array(
+ 'general',
+ 'fixed',
+ 'tollfree',
+ 'personal',
+ 'mobile',
+ 'voip',
+ 'uan',
+ );
+
+ /**
+ * Constructor for the PhoneNumber validator
+ *
+ * Options
+ * - country | string | field or value
+ * - allowed_types | array | array of allowed types
+ * - allow_possible | boolean | allow possible matches aka non-strict
+ *
+ * @param array|Traversable $options
+ */
+ public function __construct($options = array())
+ {
+ if ($options instanceof Traversable) {
+ $options = ArrayUtils::iteratorToArray($options);
+ }
+
+ if (array_key_exists('country', $options)) {
+ $this->setCountry($options['country']);
+ }
+
+ if (array_key_exists('allowed_types', $options)) {
+ $this->allowedTypes($options['allowed_types']);
+ }
+
+ if (array_key_exists('allow_possible', $options)) {
+ $this->allowPossible($options['allow_possible']);
+ }
+
+ parent::__construct($options);
+ }
+
+ /**
+ * Allowed Types
+ *
+ * @param array|null $types
+ * @return self|array
+ */
+ public function allowedTypes(array $types = null)
+ {
+ if (null !== $types) {
+ $this->allowedTypes = $types;
+
+ return $this;
+ }
+
+ return $this->allowedTypes;
+ }
+
+ /**
+ * Allow Possible
+ *
+ * @param bool|null $possible
+ * @return self|bool
+ */
+ public function allowPossible($possible = null)
+ {
+ if (null !== $possible) {
+ $this->allowPossible = (bool) $possible;
+
+ return $this;
+ }
+
+ return $this->allowPossible;
+ }
+
+ /**
+ * Get Country
+ *
+ * @return string
+ */
+ public function getCountry()
+ {
+ return $this->country;
+ }
+
+ /**
+ * Set Country
+ *
+ * @param string $country
+ * @return self
+ */
+ public function setCountry($country)
+ {
+ $this->country = $country;
+
+ return $this;
+ }
+
+ /**
+ * Load Pattern
+ *
+ * @param string $code
+ * @return array[]|false
+ */
+ protected function loadPattern($code)
+ {
+ if (!isset(self::$phone[$code])) {
+ if (!preg_match('/^[A-Z]{2}$/D', $code)) {
+ return false;
+ }
+
+ $file = __DIR__ . '/PhoneNumber/' . $code . '.php';
+ if (!file_exists($file)) {
+ return false;
+ }
+
+ self::$phone[$code] = include $file;
+ }
+
+ return self::$phone[$code];
+ }
+
+ /**
+ * Returns true if and only if $value matches phone number format
+ *
+ * @param string $value
+ * @param array $context
+ * @return bool
+ */
+ public function isValid($value = null, $context = null)
+ {
+ if (!is_scalar($value)) {
+ $this->error(self::INVALID);
+
+ return false;
+ }
+ $this->setValue($value);
+
+ $country = $this->getCountry();
+
+ if (!$countryPattern = $this->loadPattern($country)) {
+ if (isset($context[$country])) {
+ $country = $context[$country];
+ }
+
+ if (!$countryPattern = $this->loadPattern($country)) {
+ $this->error(self::UNSUPPORTED);
+
+ return false;
+ }
+ }
+
+ if ($countryPattern['code'] == substr($value, 0, strlen($countryPattern['code']))) {
+ $valueNoCountry = substr($value, strlen($countryPattern['code']));
+ }
+
+ // check against allowed types strict match:
+ foreach ($countryPattern['patterns']['national'] as $type => $pattern) {
+ if (in_array($type, $this->allowedTypes)) {
+ // check pattern:
+ if (preg_match($pattern, $value)) {
+ return true;
+ } elseif (isset($valueNoCountry) && preg_match($pattern, $valueNoCountry)) {
+ // this handles conditions where the country code and prefix are the same
+ return true;
+ }
+ }
+ }
+
+ // check for possible match:
+ if ($this->allowPossible()) {
+ foreach ($countryPattern['patterns']['possible'] as $type => $pattern) {
+ if (in_array($type, $this->allowedTypes)) {
+ // check pattern:
+ if (preg_match($pattern, $value)) {
+ return true;
+ } elseif (isset($valueNoCountry) && preg_match($pattern, $valueNoCountry)) {
+ // this handles conditions where the country code and prefix are the same
+ return true;
+ }
+ }
+ }
+ }
+
+ $this->error(self::NO_MATCH);
+
+ return false;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AC.php
new file mode 100644
index 0000000000000000000000000000000000000000..80bace7b6825cdbb264a4452791d5ec024a7a8df
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AC.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '247',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-467]\d{3}$/',
+ 'fixed' => '/^(?:[267]\d|3[0-5]|4[4-69])\d{2}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{4}$/',
+ 'fixed' => '/^\d{4}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AD.php
new file mode 100644
index 0000000000000000000000000000000000000000..528b12a2ccf58129771e7c22c04be85bae97a47d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AD.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '376',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:[346-9]|180)\d{5}$/',
+ 'fixed' => '/^[78]\d{5}$/',
+ 'mobile' => '/^[346]\d{5}$/',
+ 'tollfree' => '/^180[02]\d{4}$/',
+ 'premium' => '/^9\d{5}$/',
+ 'emergency' => '/^11[0268]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{6,8}$/',
+ 'fixed' => '/^\d{6}$/',
+ 'mobile' => '/^\d{6}$/',
+ 'tollfree' => '/^\d{8}$/',
+ 'premium' => '/^\d{6}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AE.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffaf012c55650e86f8a67bbd7f0a293bb4e65002
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AE.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '971',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-79]\d{7,8}|800\d{2,9}$/',
+ 'fixed' => '/^[2-4679][2-8]\d{6}$/',
+ 'mobile' => '/^5[0256]\d{7}$/',
+ 'tollfree' => '/^400\d{6}|800\d{2,9}$/',
+ 'premium' => '/^900[02]\d{5}$/',
+ 'shared' => '/^700[05]\d{5}$/',
+ 'uan' => '/^600[25]\d{5}$/',
+ 'emergency' => '/^112|99[789]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{5,12}$/',
+ 'fixed' => '/^\d{7,8}$/',
+ 'mobile' => '/^\d{9}$/',
+ 'tollfree' => '/^\d{5,12}$/',
+ 'premium' => '/^\d{9}$/',
+ 'shared' => '/^\d{9}$/',
+ 'uan' => '/^\d{9}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AF.php
new file mode 100644
index 0000000000000000000000000000000000000000..a0efc8604b5595d0897078f7948817cbcd89c499
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AF.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '93',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-7]\d{8}$/',
+ 'fixed' => '/^(?:[25][0-8]|[34][0-4]|6[0-5])[2-9]\d{6}$/',
+ 'mobile' => '/^7[057-9]\d{7}$/',
+ 'emergency' => '/^1(?:02|19)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{7,9}$/',
+ 'mobile' => '/^\d{9}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AG.php
new file mode 100644
index 0000000000000000000000000000000000000000..fce27ced4189d16d5524d46b8ec5d02a09e2407a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AG.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2589]\d{9}$/',
+ 'fixed' => '/^268(?:4(?:6[0-38]|84)|56[0-2])\d{4}$/',
+ 'mobile' => '/^268(?:464|7(?:2[0-9]|64|7[0-689]|8[02-68]))\d{4}$/',
+ 'pager' => '/^26840[69]\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\d{6}$/',
+ 'premium' => '/^900[2-9]\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\d{6}$/',
+ 'voip' => '/^26848[01]\d{4}$/',
+ 'emergency' => '/^9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{7}(?:\d{3})?$/',
+ 'mobile' => '/^\d{10}$/',
+ 'pager' => '/^\d{10}$/',
+ 'tollfree' => '/^\d{10}$/',
+ 'premium' => '/^\d{10}$/',
+ 'personal' => '/^\d{10}$/',
+ 'voip' => '/^\d{10}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AI.php
new file mode 100644
index 0000000000000000000000000000000000000000..7fbb0b37877e414e3d190709675f9d8021aa7496
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AI.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2589]\d{9}$/',
+ 'fixed' => '/^2644(?:6[12]|9[78])\d{4}$/',
+ 'mobile' => '/^264(?:235|476|5(?:3[6-9]|8[1-4])|7(?:29|72))\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\d{6}$/',
+ 'premium' => '/^900[2-9]\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{7}(?:\d{3})?$/',
+ 'mobile' => '/^\d{10}$/',
+ 'tollfree' => '/^\d{10}$/',
+ 'premium' => '/^\d{10}$/',
+ 'personal' => '/^\d{10}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AL.php
new file mode 100644
index 0000000000000000000000000000000000000000..e08c9fbcc250365cdcaaecafeb807c950ffe64cc
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AL.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '355',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-57]\d{7}|6\d{8}|8\d{5,7}|9\d{5}$/',
+ 'fixed' => '/^(?:2(?:[168][1-9]|[247]\d|9[1-7])|3(?:1[1-3]|[2-6]\d|[79][1-8]|8[1-9])|4\d{2}|5(?:1[1-4]|[2-578]\d|6[1-5]|9[1-7])|8(?:[19][1-5]|[2-6]\d|[78][1-7]))\d{5}$/',
+ 'mobile' => '/^6[6-9]\d{7}$/',
+ 'tollfree' => '/^800\d{4}$/',
+ 'premium' => '/^900\d{3}$/',
+ 'shared' => '/^808\d{3}$/',
+ 'personal' => '/^700\d{5}$/',
+ 'emergency' => '/^12[789]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{5,9}$/',
+ 'fixed' => '/^\d{5,8}$/',
+ 'mobile' => '/^\d{9}$/',
+ 'tollfree' => '/^\d{7}$/',
+ 'premium' => '/^\d{6}$/',
+ 'shared' => '/^\d{6}$/',
+ 'personal' => '/^\d{8}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AM.php
new file mode 100644
index 0000000000000000000000000000000000000000..497732f0223738393962941b66515276d8bdf6e4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AM.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '374',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\d{7}$/',
+ 'fixed' => '/^(?:10\d|2(?:2[2-46]|3[1-8]|4[2-69]|5[2-7]|6[1-9]|8[1-7])|3[12]2|47\d)\d{5}$/',
+ 'mobile' => '/^(?:55|77|9[1-9])\d{6}$/',
+ 'tollfree' => '/^800\d{5}$/',
+ 'premium' => '/^90[016]\d{5}$/',
+ 'shared' => '/^80[1-4]\d{5}$/',
+ 'voip' => '/^60[2-6]\d{5}$/',
+ 'shortcode' => '/^8[1-7]\d{2}|1(?:0[04-9]|[1-9]\d)$/',
+ 'emergency' => '/^10[123]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{5,8}$/',
+ 'mobile' => '/^\d{8}$/',
+ 'tollfree' => '/^\d{8}$/',
+ 'premium' => '/^\d{8}$/',
+ 'shared' => '/^\d{8}$/',
+ 'voip' => '/^\d{8}$/',
+ 'shortcode' => '/^\d{3,4}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AO.php
new file mode 100644
index 0000000000000000000000000000000000000000..760bf3084b1113b4287cfc23dccee61dfe55a89d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AO.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '244',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[29]\d{8}$/',
+ 'fixed' => '/^2\d(?:[26-9]\d|\d[26-9])\d{5}$/',
+ 'mobile' => '/^9[1-4]\d{7}$/',
+ 'emergency' => '/^11[235]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{9}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..25489f839e530a22647cc2b6c421ddee5ac06f88
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AR.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '54',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-368]\d{9}|9\d{10}$/',
+ 'fixed' => '/^11\d{8}|(?:2(?:2(?:[013]\d|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[067]\d)|4(?:7[3-8]|9\d)|6(?:[01346]\d|2[24-6]|5[15-8])|80\d|9(?:[0124789]\d|3[1-6]|5[234]|6[2-46]))|3(?:3(?:2[79]|6\d|8[2578])|4(?:[78]\d|0[0124-9]|[1-35]\d|4[24-7]|6[02-9]|9[123678])|5(?:[138]\d|2[1245]|4[1-9]|6[2-4]|7[1-6])|6[24]\d|7(?:[0469]\d|1[1568]|2[013-9]|3[145]|5[14-8]|7[2-57]|8[0-24-9])|8(?:[013578]\d|2[15-7]|4[13-6]|6[1-357-9]|9[124]))|670\d)\d{6}$/',
+ 'mobile' => '/^675\d{7}|9(?:11[2-9]\d{7}|(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578]))[2-9]\d{6}|\d{4}[2-9]\d{5})$/',
+ 'tollfree' => '/^800\d{7}$/',
+ 'premium' => '/^60[04579]\d{7}$/',
+ 'uan' => '/^810\d{7}$/',
+ 'shortcode' => '/^1(?:0[2356]|1[02-5]|21)$/',
+ 'emergency' => '/^1(?:0[017]|28)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{6,11}$/',
+ 'fixed' => '/^\d{6,10}$/',
+ 'mobile' => '/^\d{6,11}$/',
+ 'tollfree' => '/^\d{10}$/',
+ 'premium' => '/^\d{10}$/',
+ 'uan' => '/^\d{10}$/',
+ 'shortcode' => '/^\d{3}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AS.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f7b7d1863321e4c3d0e250fa441c35f6fbe7ee9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AS.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5689]\d{9}$/',
+ 'fixed' => '/^6846(?:22|33|44|55|77|88|9[19])\d{4}$/',
+ 'mobile' => '/^684(?:733|258)\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\d{6}$/',
+ 'premium' => '/^900[2-9]\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{7}(?:\d{3})?$/',
+ 'mobile' => '/^\d{10}$/',
+ 'tollfree' => '/^\d{10}$/',
+ 'premium' => '/^\d{10}$/',
+ 'personal' => '/^\d{10}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AT.php
new file mode 100644
index 0000000000000000000000000000000000000000..4be4f8f2f0d3d8b4328a27770cc613a898a699f6
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AT.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '43',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\d{3,12}$/',
+ 'fixed' => '/^1\d{3,12}|(?:2(?:1[467]|2[13-8]|5[2357]|6[1-46-8]|7[1-8]|8[124-7]|9[1458])|3(?:1[1-8]|3[23568]|4[5-7]|5[1378]|6[1-38]|8[3-68])|4(?:2[1-8]|35|63|7[1368]|8[2457])|5(?:12|2[1-8]|3[357]|4[147]|5[12578]|6[37])|6(?:13|2[1-47]|4[1-35-8]|5[468]|62)|7(?:2[1-8]|3[25]|4[13478]|5[68]|6[16-8]|7[1-6]|9[45]))\d{3,10}$/',
+ 'mobile' => '/^6(?:44|5[0-3579]|6[013-9]|[7-9]\d)\d{4,10}$/',
+ 'tollfree' => '/^80[02]\d{6,10}$/',
+ 'premium' => '/^(?:711|9(?:0[01]|3[019]))\d{6,10}$/',
+ 'shared' => '/^8(?:10|2[018])\d{6,10}$/',
+ 'voip' => '/^780\d{6,10}$/',
+ 'uan' => '/^5(?:(?:0[1-9]|17)\d{2,10}|[79]\d{3,11})|720\d{6,10}$/',
+ 'emergency' => '/^1(?:[12]2|33|44)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{3,13}$/',
+ 'mobile' => '/^\d{7,13}$/',
+ 'tollfree' => '/^\d{9,13}$/',
+ 'premium' => '/^\d{9,13}$/',
+ 'shared' => '/^\d{9,13}$/',
+ 'voip' => '/^\d{9,13}$/',
+ 'uan' => '/^\d{5,13}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AU.php
new file mode 100644
index 0000000000000000000000000000000000000000..48ef9fbe18d09bccc742e006f2f37979341ea41d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AU.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '61',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-578]\d{5,9}$/',
+ 'fixed' => '/^[237]\d{8}|8(?:[68]\d{3}|7[0-69]\d{2}|9(?:[02-9]\d{2}|1(?:[0-57-9]\d|6[0135-9])))\d{4}$/',
+ 'mobile' => '/^14(?:5\d|71)\d{5}|4(?:[0-2]\d|3[0-57-9]|4[47-9]|5[0-35-9]|6[6-9]|[79][07-9]|8[17-9])\d{6}$/',
+ 'pager' => '/^16\d{3,7}$/',
+ 'tollfree' => '/^180(?:0\d{3}|2)\d{3}$/',
+ 'premium' => '/^19(?:0[0126]\d{6}|[13-5]\d{3}|[679]\d{5})$/',
+ 'shared' => '/^13(?:00\d{2})?\d{4}$/',
+ 'personal' => '/^500\d{6}$/',
+ 'voip' => '/^550\d{6}$/',
+ 'emergency' => '/^000|112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\d{6,10}$/',
+ 'fixed' => '/^\d{8,9}$/',
+ 'mobile' => '/^\d{9}$/',
+ 'pager' => '/^\d{5,9}$/',
+ 'tollfree' => '/^\d{7,10}$/',
+ 'premium' => '/^\d{6,10}$/',
+ 'shared' => '/^\d{6,10}$/',
+ 'personal' => '/^\d{9}$/',
+ 'voip' => '/^\d{9}$/',
+ 'emergency' => '/^\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AW.php
new file mode 100644
index 0000000000000000000000000000000000000000..b5ade6fc4f2dc894d42471eddb2ea747e01166dc
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AW.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '297',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[25-9]\\d{6}$/',
+ 'fixed' => '/^5(?:2\\d|8[1-9])\\d{4}$/',
+ 'mobile' => '/^(?:5(?:6\\d|9[2-478])|6(?:[039]0|22|4[01]|6[0-2])|7[34]\\d|9(?:6[45]|9[4-8]))\\d{4}$/',
+ 'tollfree' => '/^800\\d{4}$/',
+ 'premium' => '/^900\\d{4}$/',
+ 'voip' => '/^28\\d{5}|501\\d{4}$/',
+ 'emergency' => '/^100|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AX.php
new file mode 100644
index 0000000000000000000000000000000000000000..75c53482d28734bbe150f0e51e0f93b7aecc135e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AX.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '358',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[135]\\d{5,9}|[27]\\d{4,9}|4\\d{5,10}|6\\d{7,8}|8\\d{6,9}$/',
+ 'fixed' => '/^18[1-8]\\d{3,9}$/',
+ 'mobile' => '/^4\\d{5,10}|50\\d{4,8}$/',
+ 'tollfree' => '/^800\\d{4,7}$/',
+ 'premium' => '/^[67]00\\d{5,6}$/',
+ 'uan' => '/^[13]0\\d{4,8}|2(?:0(?:[016-8]\\d{3,7}|[2-59]\\d{2,7})|9\\d{4,8})|60(?:[12]\\d{5,6}|6\\d{7})|7(?:1\\d{7}|3\\d{8}|5[03-9]\\d{2,7})$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,12}$/',
+ 'fixed' => '/^\\d{6,12}$/',
+ 'mobile' => '/^\\d{6,11}$/',
+ 'tollfree' => '/^\\d{7,10}$/',
+ 'premium' => '/^\\d{8,9}$/',
+ 'uan' => '/^\\d{5,10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..be93b0f263c577829e72ab69c74329bbd7681655
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AZ.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '994',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{8}$/',
+ 'fixed' => '/^(?:1[28]\\d|2(?:02|1[24]|2[2-4]|33|[45]2|6[23])|365)\\d{6}$/',
+ 'mobile' => '/^(?:4[04]|5[015]|60|7[07])\\d{7}$/',
+ 'tollfree' => '/^88\\d{7}$/',
+ 'premium' => '/^900200\\d{3}$/',
+ 'emergency' => '/^1(?:0[123]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BA.php
new file mode 100644
index 0000000000000000000000000000000000000000..c089c7453a71900543dcec5639de8c61487c73b7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BA.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '387',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3-9]\\d{7,8}$/',
+ 'fixed' => '/^(?:[35]\\d|49)\\d{6}$/',
+ 'mobile' => '/^6(?:03|44|71|[1-356])\\d{6}$/',
+ 'tollfree' => '/^8[08]\\d{6}$/',
+ 'premium' => '/^9[0246]\\d{6}$/',
+ 'shared' => '/^8[12]\\d{6}$/',
+ 'uan' => '/^70[23]\\d{5}$/',
+ 'emergency' => '/^12[234]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'mobile' => '/^\\d{8,9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'uan' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BB.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec6c441c8d01e2a84723316a1cf413b24c61af54
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BB.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2589]\\d{9}$/',
+ 'fixed' => '/^246[2-9]\\d{6}$/',
+ 'mobile' => '/^246(?:(?:2[346]|45|82)\\d|25[0-4])\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^[235]11$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BD.php
new file mode 100644
index 0000000000000000000000000000000000000000..4680bcf7c9d1682278371df8cc56d0e9979e942f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BD.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '880',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-79]\\d{5,9}|1\\d{9}|8[0-7]\\d{4,8}$/',
+ 'fixed' => '/^2(?:7(?:1[0-267]|2[0-289]|3[0-29]|[46][01]|5[1-3]|7[017]|91)|8(?:0[125]|[139][1-6]|2[0157-9]|6[1-35]|7[1-5]|8[1-8])|9(?:0[0-2]|1[1-4]|2[568]|3[3-6]|5[5-7]|6[0167]|7[15]|8[016-8]))\\d{4}|3(?:12?[5-7]\\d{2}|0(?:2(?:[025-79]\\d|[348]\\d{1,2})|3(?:[2-4]\\d|[56]\\d?))|2(?:1\\d{2}|2(?:[12]\\d|[35]\\d{1,2}|4\\d?))|3(?:1\\d{2}|2(?:[2356]\\d|4\\d{1,2}))|4(?:1\\d{2}|2(?:2\\d{1,2}|[47]|5\\d{2}))|5(?:1\\d{2}|29)|[67]1\\d{2}|8(?:1\\d{2}|2(?:2\\d{2}|3|4\\d))|)\\d{3}|4(?:0(?:2(?:[09]\\d|7)|33\\d{2})|1\\d{3}|2(?:1\\d{2}|2(?:[25]\\d?|[348]\\d|[67]\\d{1,2}))|3(?:1\\d{2}(?:\\d{2})?|2(?:[045]\\d|[236-9]\\d{1,2})|32\\d{2})|4(?:[18]\\d{2}|2(?:[2-46]\\d{2}|3)|5[25]\\d{2})|5(?:1\\d{2}|2(?:3\\d|5))|6(?:[18]\\d{2}|2(?:3(?:\\d{2})?|[46]\\d{1,2}|5\\d{2}|7\\d)|5(?:3\\d?|4\\d|[57]\\d{1,2}|6\\d{2}|8))|71\\d{2}|8(?:[18]\\d{2}|23\\d{2}|54\\d{2})|9(?:[18]\\d{2}|2[2-5]\\d{2}|53\\d{1,2}))\\d{3}|5(?:02[03489]\\d{2}|1\\d{2}|2(?:1\\d{2}|2(?:2(?:\\d{2})?|[457]\\d{2}))|3(?:1\\d{2}|2(?:[37](?:\\d{2})?|[569]\\d{2}))|4(?:1\\d{2}|2[46]\\d{2})|5(?:1\\d{2}|26\\d{1,2})|6(?:[18]\\d{2}|2|53\\d{2})|7(?:1|24)\\d{2}|8(?:1|26)\\d{2}|91\\d{2})\\d{3}|6(?:0(?:1\\d{2}|2(?:3\\d{2}|4\\d{1,2}))|2(?:2[2-5]\\d{2}|5(?:[3-5]\\d{2}|7)|8\\d{2})|3(?:1|2[3478])\\d{2}|4(?:1|2[34])\\d{2}|5(?:1|2[47])\\d{2}|6(?:[18]\\d{2}|6(?:2(?:2\\d|[34]\\d{2})|5(?:[24]\\d{2}|3\\d|5\\d{1,2})))|72[2-5]\\d{2}|8(?:1\\d{2}|2[2-5]\\d{2})|9(?:1\\d{2}|2[2-6]\\d{2}))\\d{3}|7(?:(?:02|[3-589]1|6[12]|72[24])\\d{2}|21\\d{3}|32)\\d{3}|8(?:(?:4[12]|[5-7]2|1\\d?)|(?:0|3[12]|[5-7]1|217)\\d)\\d{4}|9(?:[35]1|(?:[024]2|81)\\d|(?:1|[24]1)\\d{2})\\d{3}$/',
+ 'mobile' => '/^(?:1[13-9]\\d|(?:3[78]|44)[02-9]|6(?:44|6[02-9]))\\d{7}$/',
+ 'tollfree' => '/^80[03]\\d{7}$/',
+ 'voip' => '/^96(?:0[49]|1[0-4]|6[69])\\d{6}$/',
+ 'shortcode' => '/^1(?:0(?:[39]|5(?:0\\d|[1-4])|6\\d{2}|7[0-4]|8[0-29])|1[6-9]|2(?:2[0-5]|[34])|3(?:1\\d?|3\\d|6[3-6])|4(?:0\\d|1\\d{2})|5[2-9])$/',
+ 'emergency' => '/^10[0-2]|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{3,5}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BE.php
new file mode 100644
index 0000000000000000000000000000000000000000..6165ca101dd9acd0c286743c4644503fb31b3ddb
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BE.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '32',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{7,8}$/',
+ 'fixed' => '/^(?:1[0-69]|[23][2-8]|[49][23]|5\\d|6[013-57-9]|71)\\d{6}|8(?:0[1-9]|[1-79]\\d)\\d{5}$/',
+ 'mobile' => '/^4(?:[679]\\d|8[03-9])\\d{6}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^(?:90|7[07])\\d{6}$/',
+ 'uan' => '/^78\\d{6}$/',
+ 'emergency' => '/^1(?:0[01]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'uan' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BF.php
new file mode 100644
index 0000000000000000000000000000000000000000..02df9959524ac4e1060c9938a0f2daa6d3496514
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BF.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '226',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[24-7]\\d{7}$/',
+ 'fixed' => '/^(?:20(?:49|5[23]|9[016-9])|40(?:4[56]|5[4-6]|7[0179])|50[34]\\d)\\d{4}$/',
+ 'mobile' => '/^(?:6(?:[056]\\d|1[0-3]|8[0-2]|90)|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}$/',
+ 'emergency' => '/^1[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BG.php
new file mode 100644
index 0000000000000000000000000000000000000000..228737169b20accac4eec7b43048e87001580cac
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BG.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '359',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[23567]\\d{5,7}|[489]\\d{6,8}$/',
+ 'fixed' => '/^2(?:[0-8]\\d{5,6}|9\\d{4,6})|(?:[36]\\d|5[1-9]|8[1-6]|9[1-7])\\d{5,6}|(?:4(?:[124-7]\\d|3[1-6])|7(?:0[1-9]|[1-9]\\d))\\d{4,5}$/',
+ 'mobile' => '/^(?:8[7-9]|98)\\d{7}|4(?:3[0789]|8\\d)\\d{5}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^90\\d{6}$/',
+ 'personal' => '/^700\\d{5}$/',
+ 'emergency' => '/^1(?:12|50|6[06])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,9}$/',
+ 'fixed' => '/^\\d{5,8}$/',
+ 'mobile' => '/^\\d{8,9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BH.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d70a4c319810a0b8ed7b17853c4cd8cfbaabf35
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BH.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '973',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[136-9]\\d{7}$/',
+ 'fixed' => '/^(?:1(?:3[3-6]|6[0156]|7\\d)\\d|6(?:1[16]\\d|6(?:0\\d|3[12]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}$/',
+ 'mobile' => '/^(?:3(?:[23469]\\d|5[35]|77|8[348])\\d|6(?:1[16]\\d|6(?:[06]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}$/',
+ 'tollfree' => '/^80\\d{6}$/',
+ 'premium' => '/^(?:87|9[014578])\\d{6}$/',
+ 'shared' => '/^84\\d{6}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BI.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e91f6d6fd99176e7964fa605b4d2f0b62aa8fbd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BI.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '257',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[27]\\d{7}$/',
+ 'fixed' => '/^22(?:2[0-7]|[3-5]0)\\d{4}$/',
+ 'mobile' => '/^(?:29\\d|7(?:1[1-3]|[4-9]\\d))\\d{5}$/',
+ 'emergency' => '/^11[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BJ.php
new file mode 100644
index 0000000000000000000000000000000000000000..b79c921b2c7b8c6204968efcf47aaed43cb27c24
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BJ.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '229',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2689]\\d{7}|7\\d{3}$/',
+ 'fixed' => '/^2(?:02|1[037]|2[45]|3[68])\\d{5}$/',
+ 'mobile' => '/^(?:6[46]|9[03-8])\\d{6}$/',
+ 'tollfree' => '/^7[3-5]\\d{2}$/',
+ 'voip' => '/^857[58]\\d{4}$/',
+ 'uan' => '/^81\\d{6}$/',
+ 'emergency' => '/^11[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,8}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{4}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'uan' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BL.php
new file mode 100644
index 0000000000000000000000000000000000000000..e82474c570e219d84b4400ee875cdd19f6633548
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BL.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '590',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[56]\\d{8}$/',
+ 'fixed' => '/^590(?:2[7-9]|5[12]|87)\\d{4}$/',
+ 'mobile' => '/^690(?:10|2[27]|66|77|8[78])\\d{4}$/',
+ 'emergency' => '/^18$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BM.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ac4a683a929ee45ae95e0e3c3d9aaa2163230ef
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BM.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[4589]\\d{9}$/',
+ 'fixed' => '/^441(?:2(?:02|23|61|[3479]\\d)|[46]\\d{2}|5(?:4\\d|60|89)|824)\\d{4}$/',
+ 'mobile' => '/^441(?:[37]\\d|5[0-39])\\d{5}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BN.php
new file mode 100644
index 0000000000000000000000000000000000000000..e2e5b4a30138843ec117b6f7d0d387c35d714d28
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BN.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '673',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-578]\\d{6}$/',
+ 'fixed' => '/^[2-5]\\d{6}$/',
+ 'mobile' => '/^[78]\\d{6}$/',
+ 'emergency' => '/^99[135]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BO.php
new file mode 100644
index 0000000000000000000000000000000000000000..89be909be3e665c5696eae290c45c2f65f790741
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BO.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '591',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[23467]\\d{7}$/',
+ 'fixed' => '/^(?:2(?:2\\d{2}|5(?:11|[258]\\d|9[67])|6(?:12|2\\d|9[34])|8(?:2[34]|39|62))|3(?:3\\d{2}|4(?:6\\d|8[24])|8(?:25|42|5[257]|86|9[25])|9(?:2\\d|3[234]|4[248]|5[24]|6[2-6]|7\\d))|4(?:4\\d{2}|6(?:11|[24689]\\d|72)))\\d{4}$/',
+ 'mobile' => '/^[67]\\d{7}$/',
+ 'emergency' => '/^11[089]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BQ.php
new file mode 100644
index 0000000000000000000000000000000000000000..69e67543667e102df91b9c42122a34e5924bf675
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BQ.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '599',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[347]\\d{6}$/',
+ 'fixed' => '/^(?:318[023]|416[0239]|7(?:1[578]|50)\\d)\\d{3}$/',
+ 'mobile' => '/^(?:318[1456]|416[15-8]|7(?:0[01]|[89]\\d)\\d)\\d{3}|$/',
+ 'emergency' => '/^112|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BR.php
new file mode 100644
index 0000000000000000000000000000000000000000..38607b0add46374f62188bfc9b45434f34fa41fc
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BR.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '55',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-46-9]\\d{7,10}|5\\d{8,9}$/',
+ 'fixed' => '/^1[1-9][2-5]\\d{7}|(?:[4689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-5]\\d{7}$/',
+ 'mobile' => '/^1(?:1(?:5[347]|[6-8]\\d|9\\d{1,2})|[2-9][6-9]\\d)\\d{6}|(?:[4689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[6-9]\\d{7}$/',
+ 'tollfree' => '/^800\\d{6,7}$/',
+ 'premium' => '/^[359]00\\d{6,7}$/',
+ 'shared' => '/^[34]00\\d{5}$/',
+ 'emergency' => '/^1(?:12|28|9[023])|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,11}$/',
+ 'mobile' => '/^\\d{10,11}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BS.php
new file mode 100644
index 0000000000000000000000000000000000000000..c33944ce06844359876786b92df8de64e11ff794
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BS.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2589]\\d{9}$/',
+ 'fixed' => '/^242(?:3(?:02|[236][1-9]|4[0-24-9]|5[0-68]|7[3467]|8[0-4]|9[2-467])|461|502|6(?:12|7[67]|8[78]|9[89])|702)\\d{4}$/',
+ 'mobile' => '/^242(?:3(?:5[79]|[79]5)|4(?:[2-4][1-9]|5[1-8]|6[2-8]|7\\d|81)|5(?:2[45]|3[35]|44|5[1-9]|65|77)|6[34]6|727)\\d{4}$/',
+ 'tollfree' => '/^242300\\d{4}|8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^91[19]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BT.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d008ee425abc5c4e92b7cfd85de2f18449d1f7c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BT.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '975',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-8]\\d{6,7}$/',
+ 'fixed' => '/^(?:2[3-6]|[34][5-7]|5[236]|6[2-46]|7[246]|8[2-4])\\d{5}$/',
+ 'mobile' => '/^[17]7\\d{6}$/',
+ 'emergency' => '/^11[023]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,8}$/',
+ 'fixed' => '/^\\d{6,7}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BW.php
new file mode 100644
index 0000000000000000000000000000000000000000..e316531e75b907fbca37a70a3a3b75ba87bb1345
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BW.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '267',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-79]\\d{6,7}$/',
+ 'fixed' => '/^(?:2(?:4[0-48]|6[0-24]|9[0578])|3(?:1[0235-9]|55|6\\d|7[01]|9[0-57])|4(?:6[03]|7[1267]|9[0-5])|5(?:3[0389]|4[0489]|7[1-47]|88|9[0-49])|6(?:2[1-35]|5[149]|8[067]))\\d{4}$/',
+ 'mobile' => '/^7(?:[1-35]\\d{6}|[46][0-7]\\d{5}|7[01]\\d{5})$/',
+ 'premium' => '/^90\\d{5}$/',
+ 'voip' => '/^79[12][01]\\d{4}$/',
+ 'emergency' => '/^99[789]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{7}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BY.php
new file mode 100644
index 0000000000000000000000000000000000000000..eeb103181ad450873eb0367e5c137bcf617f3762
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BY.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '375',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-4]\\d{8}|[89]\\d{9,10}$/',
+ 'fixed' => '/^(?:1(?:5(?:1[1-5]|2\\d|6[2-4]|9[1-7])|6(?:[235]\\d|4[1-7])|7\\d{2})|2(?:1(?:[246]\\d|3[0-35-9]|5[1-9])|2(?:[235]\\d|4[0-8])|3(?:2\\d|3[02-79]|4[024-7]|5[0-7])))\\d{5}$/',
+ 'mobile' => '/^(?:2(?:5[5679]|9[1-9])|33\\d|44\\d)\\d{6}$/',
+ 'tollfree' => '/^8(?:0[13]|20\\d)\\d{7}$/',
+ 'premium' => '/^(?:810|902)\\d{7}$/',
+ 'emergency' => '/^1(?:0[123]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,11}$/',
+ 'fixed' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{10,11}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..31a63bf6c67d67cf476449b0eebdade141e19f48
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BZ.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '501',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-8]\\d{6}|0\\d{10}$/',
+ 'fixed' => '/^[234578][02]\\d{5}$/',
+ 'mobile' => '/^6[0-367]\\d{5}$/',
+ 'tollfree' => '/^0800\\d{7}$/',
+ 'emergency' => '/^9(?:0|11)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{4})?$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{7}$/',
+ 'tollfree' => '/^\\d{11}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CA.php
new file mode 100644
index 0000000000000000000000000000000000000000..f179f054d251a460b068b6c51521ba691ef12a3e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CA.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{9}|3\\d{6}$/',
+ 'fixed' => '/^(?:2(?:04|[23]6|[48]9|50)|3(?:06|43|65)|4(?:03|1[68]|3[178]|5[06])|5(?:0[06]|1[49]|79|8[17])|6(?:0[04]|13|39|47)|7(?:0[059]|80|78)|8(?:[06]7|19|73)|90[25])[2-9]\\d{6}|310\\d{4}$/',
+ 'mobile' => '/^(?:2(?:04|[23]6|[48]9|50)|3(?:06|43|65)|4(?:03|1[68]|3[178]|5[06])|5(?:0[06]|1[49]|79|8[17])|6(?:0[04]|13|39|47)|7(?:0[059]|80|78)|8(?:[06]7|19|73)|90[25])[2-9]\\d{6}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}|310\\d{4}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^112|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CC.php
new file mode 100644
index 0000000000000000000000000000000000000000..b709d61686508c81c94dcae30b680b3f00ee7797
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CC.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '61',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1458]\\d{5,9}$/',
+ 'fixed' => '/^89162\\d{4}$/',
+ 'mobile' => '/^4(?:[0-2]\\d|3[0-57-9]|4[47-9]|5[0-37-9]|6[6-9]|7[07-9]|8[7-9])\\d{6}$/',
+ 'tollfree' => '/^1(?:80(?:0\\d{2})?|3(?:00\\d{2})?)\\d{4}$/',
+ 'premium' => '/^190[0126]\\d{6}$/',
+ 'personal' => '/^500\\d{6}$/',
+ 'voip' => '/^550\\d{6}$/',
+ 'emergency' => '/^000|112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{8,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{6,10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CD.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3d2ec723502cb41c0b53b0690a0cd9108700f4a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CD.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '243',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-6]\\d{6}|8\\d{6,8}|9\\d{8}$/',
+ 'fixed' => '/^[1-6]\\d{6}$/',
+ 'mobile' => '/^8(?:[0-259]\\d{2}|[48])\\d{5}|9[7-9]\\d{7}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{7}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CF.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ef2463b135c7bc6445d63234380cad6f5295654
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CF.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '236',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[278]\\d{7}$/',
+ 'fixed' => '/^2[12]\\d{6}$/',
+ 'mobile' => '/^7[0257]\\d{6}$/',
+ 'premium' => '/^8776\\d{4}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CG.php
new file mode 100644
index 0000000000000000000000000000000000000000..48cb31900f3a0ca431c8f36baa13e933e4e38b73
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CG.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '242',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[028]\\d{8}$/',
+ 'fixed' => '/^222[1-589]\\d{5}$/',
+ 'mobile' => '/^0[14-6]\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..c863c64a8e844d5fd4b46f8f648af9ece75b5f23
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CH.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '41',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{8}|860\\d{9}$/',
+ 'fixed' => '/^(?:2[12467]|3[1-4]|4[134]|5[12568]|6[12]|[7-9]1)\\d{7}$/',
+ 'mobile' => '/^7[46-9]\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^90[016]\\d{6}$/',
+ 'shared' => '/^84[0248]\\d{6}$/',
+ 'personal' => '/^878\\d{6}$/',
+ 'voicemail' => '/^860\\d{9}$/',
+ 'emergency' => '/^1(?:1[278]|44)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}(?:\\d{3})?$/',
+ 'fixed' => '/^\\d{9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shared' => '/^\\d{9}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'voicemail' => '/^\\d{12}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CI.php
new file mode 100644
index 0000000000000000000000000000000000000000..b86454d7778b6a52187f5ca185086eef55d08248
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CI.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '225',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[02-6]\\d{7}$/',
+ 'fixed' => '/^(?:2(?:0[023]|1[02357]|[23][045]|4[03-5])|3(?:0[06]|1[069]|[2-4][07]|5[09]|6[08]))\\d{5}$/',
+ 'mobile' => '/^(?:0[1-9]|4[0-24-9]|5[057-9]|6[05679])\\d{6}$/',
+ 'emergency' => '/^1(?:1[01]|[78]0)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CK.php
new file mode 100644
index 0000000000000000000000000000000000000000..da35666d88caaca9fbd6f9774564fe9befa14025
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CK.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '682',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-57]\\d{4}$/',
+ 'fixed' => '/^(?:2\\d|3[13-7]|4[1-5])\\d{3}$/',
+ 'mobile' => '/^(?:5[0-68]|7\\d)\\d{3}$/',
+ 'emergency' => '/^99[689]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CL.php
new file mode 100644
index 0000000000000000000000000000000000000000..985e7e4993e5ec988bc9cfb10c00cd3021dcf05c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CL.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '56',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:[2-9]|600|123)\\d{7,8}$/',
+ 'fixed' => '/^(?:[23]2|41|58)\\d{7}|(?:3[3-5]|4[235]|5[1-357]|6[13-57]|7[1-35])\\d{6,7}$/',
+ 'mobile' => '/^9[5-9]\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}|1230\\d{7}$/',
+ 'shared' => '/^600\\d{7,8}$/',
+ 'voip' => '/^44\\d{7}$/',
+ 'emergency' => '/^13[123]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,11}$/',
+ 'fixed' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{8,9}$/',
+ 'tollfree' => '/^\\d{9,11}$/',
+ 'shared' => '/^\\d{10,11}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CM.php
new file mode 100644
index 0000000000000000000000000000000000000000..0faddb67a01e8067cc78d267f23bbaac57f39345
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CM.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '237',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[237-9]\\d{7}$/',
+ 'fixed' => '/^(?:22|33)\\d{6}$/',
+ 'mobile' => '/^[79]\\d{7}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^88\\d{6}$/',
+ 'emergency' => '/^1?1[37]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CN.php
new file mode 100644
index 0000000000000000000000000000000000000000..0553e6d1d7ae15bf4fec7dca9b41c99e3a4bb8b8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CN.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '86',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-7]\\d{7,11}|8[0-357-9]\\d{6,9}|9(?:5\\d{3}|\\d{9})$/',
+ 'fixed' => '/^21\\d{8,10}|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|898)\\d{8}|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[3-9]|5[2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-3689]|6[2368]|9[02-9])|8(?:1[236-8]|2[5-7]|[37]\\d|5[1-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))\\d{7}|80(?:29|6[03578]|7[018]|81)\\d{4}$/',
+ 'mobile' => '/^1(?:3\\d|4[57]|[58][0-35-9])\\d{8}$/',
+ 'tollfree' => '/^(?:10)?800\\d{7}$/',
+ 'premium' => '/^16[08]\\d{5}$/',
+ 'shared' => '/^400\\d{7}|95\\d{3}$/',
+ 'emergency' => '/^1(?:1[09]|20)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,12}$/',
+ 'mobile' => '/^\\d{11}$/',
+ 'tollfree' => '/^\\d{10,12}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{5}(?:\\d{5})?$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CO.php
new file mode 100644
index 0000000000000000000000000000000000000000..afb6e020797be06e03e2dbe4f4bf5ba3a8b2a4aa
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CO.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '57',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:[13]\\d{0,3}|[24-8])\\d{7}$/',
+ 'fixed' => '/^[124-8][2-9]\\d{6}$/',
+ 'mobile' => '/^3(?:0[0-24]|1\\d|2[01])\\d{7}$/',
+ 'tollfree' => '/^1800\\d{7}$/',
+ 'premium' => '/^19(?:0[01]|4[78])\\d{7}$/',
+ 'emergency' => '/^1(?:1[29]|23|32|56)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,11}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{11}$/',
+ 'premium' => '/^\\d{11}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CR.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e622e1cc1737cb0cf80c0dd012e81ff0ceaf533
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CR.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '506',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[24-9]\\d{7,9}$/',
+ 'fixed' => '/^2[24-7]\\d{6}$/',
+ 'mobile' => '/^5(?:0[0-4]|7[01])\\d{5}|[67][0-2]\\d{6}|8[3-9]\\d{6}$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'premium' => '/^90[059]\\d{7}$/',
+ 'voip' => '/^210[0-6]\\d{4}|4(?:0(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|1[01]\\d{5}|400\\d{4})|5100\\d{4}$/',
+ 'shortcode' => '/^1(?:0(?:00|15|2[2-4679])|1(?:1[0-35-9]|37|[46]6|75|8[79]|9[0-379])|2(?:00|[12]2|34|55)|333|400|5(?:15|5[15])|693|7(?:00|1[789]|2[02]|[67]7))$/',
+ 'emergency' => '/^112|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,10}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CU.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2e915fec27739320dbda6837a797b7983b7dc8d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CU.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '53',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-57]\\d{5,7}$/',
+ 'fixed' => '/^2[1-4]\\d{5,6}|3(?:1\\d{6}|[23]\\d{4,6})|4(?:[125]\\d{5,6}|[36]\\d{6}|[78]\\d{4,6})|7\\d{6,7}$/',
+ 'mobile' => '/^5\\d{7}$/',
+ 'shortcode' => '/^1(?:1(?:6111|8)|40)$/',
+ 'emergency' => '/^10[456]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CV.php
new file mode 100644
index 0000000000000000000000000000000000000000..3bae74571cafe0dc497a467c3e298515d3b7c158
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CV.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '238',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[259]\\d{6}$/',
+ 'fixed' => '/^2(?:2[1-7]|3[0-8]|4[12]|5[1256]|6\\d|7[1-3]|8[1-5])\\d{4}$/',
+ 'mobile' => '/^(?:9\\d|59)\\d{5}$/',
+ 'emergency' => '/^13[012]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CW.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ba1da8663e0a82149615a7011f6473b39747f11
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CW.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '599',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[169]\\d{6,7}$/',
+ 'fixed' => '/^9(?:[48]\\d{2}|50\\d|7(?:2[0-2]|[34]\\d|6[35-7]|77))\\d{4}$/',
+ 'mobile' => '/^9(?:5(?:[1246]\\d|3[01])|6(?:[1679]\\d|3[01]))\\d{4}$/',
+ 'pager' => '/^955\\d{5}$/',
+ 'shared' => '/^(?:10|69)\\d{5}$/',
+ 'emergency' => '/^112|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'shared' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CX.php
new file mode 100644
index 0000000000000000000000000000000000000000..d488a45df6a2851947b31a9c7ae1d6fb99c314cc
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CX.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '61',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1458]\\d{5,9}$/',
+ 'fixed' => '/^89164\\d{4}$/',
+ 'mobile' => '/^4(?:[0-2]\\d|3[0-57-9]|4[47-9]|5[0-37-9]|6[6-9]|7[07-9]|8[7-9])\\d{6}$/',
+ 'tollfree' => '/^1(?:80(?:0\\d{2})?|3(?:00\\d{2})?)\\d{4}$/',
+ 'premium' => '/^190[0126]\\d{6}$/',
+ 'personal' => '/^500\\d{6}$/',
+ 'voip' => '/^550\\d{6}$/',
+ 'emergency' => '/^000|112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{8,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{6,10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CY.php
new file mode 100644
index 0000000000000000000000000000000000000000..6c1c8a29bc3c00b88f9ca88a9283e950442f3520
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CY.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '357',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[257-9]\\d{7}$/',
+ 'fixed' => '/^2[2-6]\\d{6}$/',
+ 'mobile' => '/^9[5-79]\\d{6}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^90[09]\\d{5}$/',
+ 'shared' => '/^80[1-9]\\d{5}$/',
+ 'personal' => '/^700\\d{5}$/',
+ 'uan' => '/^(?:50|77)\\d{6}$/',
+ 'emergency' => '/^1(?:12|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a091f3699e1990e0252163ee11e51fb925475b1
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CZ.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '420',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-8]\\d{8}|9\\d{8,11}$/',
+ 'fixed' => '/^2\\d{8}|(?:3[1257-9]|4[16-9]|5[13-9])\\d{7}$/',
+ 'mobile' => '/^(?:60[1-8]|7(?:0[2-5]|[2379]\\d))\\d{6}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^9(?:0[05689]|76)\\d{6}$/',
+ 'shared' => '/^8[134]\\d{7}$/',
+ 'personal' => '/^70[01]\\d{6}$/',
+ 'voip' => '/^9[17]0\\d{6}$/',
+ 'uan' => '/^9(?:5[056]|7[234])\\d{6}$/',
+ 'voicemail' => '/^9(?:3\\d{9}|6\\d{7,10})$/',
+ 'shortcode' => '/^1(?:1(?:6\\d{3}|8\\d)|2\\d{2,3}|3\\d{3,4}|4\\d{3}|99)$/',
+ 'emergency' => '/^1(?:12|5[058])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9,12}$/',
+ 'voicemail' => '/^\\d{9,12}$/',
+ 'shortcode' => '/^\\d{4,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DE.php
new file mode 100644
index 0000000000000000000000000000000000000000..7437c35adf9e7932437f658d0af33416ad46f262
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DE.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '49',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-35-9]\\d{3,14}|4(?:[0-8]\\d{4,12}|9(?:[0-37]\\d|4(?:[1-35-8]|4\\d?)|5\\d{1,2}|6[1-8]\\d?)\\d{2,7})$/',
+ 'fixed' => '/^[246]\\d{5,13}|3(?:[03-9]\\d{4,13}|2\\d{9})|5(?:0[2-8]|[1256]\\d|[38][0-8]|4\\d{0,2}|[79][0-7])\\d{3,11}|7(?:0[2-8]|[1-9]\\d)\\d{3,10}|8(?:0[2-9]|[1-9]\\d)\\d{3,10}|9(?:0[6-9]|[1-9]\\d)\\d{3,10}$/',
+ 'mobile' => '/^1(?:5[0-2579]\\d{8}|6[023]\\d{7,8}|7(?:[0-57-9]\\d?|6\\d)\\d{7})$/',
+ 'pager' => '/^16(?:4\\d{1,10}|[89]\\d{1,11})$/',
+ 'tollfree' => '/^800\\d{7,10}$/',
+ 'premium' => '/^900(?:[135]\\d{6}|9\\d{7})$/',
+ 'shared' => '/^180\\d{5,11}$/',
+ 'personal' => '/^700\\d{8}$/',
+ 'uan' => '/^18(?:1\\d{5,11}|[2-9]\\d{8})$/',
+ 'voicemail' => '/^17799\\d{7,8}$/',
+ 'shortcode' => '/^115$/',
+ 'emergency' => '/^11[02]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{2,15}$/',
+ 'mobile' => '/^\\d{10,11}$/',
+ 'pager' => '/^\\d{4,14}$/',
+ 'tollfree' => '/^\\d{10,13}$/',
+ 'premium' => '/^\\d{10,11}$/',
+ 'shared' => '/^\\d{8,14}$/',
+ 'personal' => '/^\\d{11}$/',
+ 'uan' => '/^\\d{8,14}$/',
+ 'voicemail' => '/^\\d{12,13}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DJ.php
new file mode 100644
index 0000000000000000000000000000000000000000..d33b7c76b6def6577f32a1e1f94c511ee544f0d0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DJ.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '253',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[27]\\d{7}$/',
+ 'fixed' => '/^2(?:1[2-5]|7[45])\\d{5}$/',
+ 'mobile' => '/^77[6-8]\\d{5}$/',
+ 'emergency' => '/^1[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DK.php
new file mode 100644
index 0000000000000000000000000000000000000000..57acb2934411dbedf990fbbaadf6591e0a96186b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DK.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '45',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{7}$/',
+ 'fixed' => '/^(?:[2-7]\\d|8[126-9]|9[126-9])\\d{6}$/',
+ 'mobile' => '/^(?:[2-7]\\d|8[126-9]|9[126-9])\\d{6}$/',
+ 'tollfree' => '/^80\\d{6}$/',
+ 'premium' => '/^90\\d{6}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DM.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7ca72eb38367ca420ca129638857f9d413b3cf2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DM.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[57-9]\\d{9}$/',
+ 'fixed' => '/^767(?:2(?:55|66)|4(?:2[01]|4[0-25-9])|50[0-4])\\d{4}$/',
+ 'mobile' => '/^767(?:2(?:[234689]5|7[5-7])|31[5-7]|61[2-7])\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^333|9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DO.php
new file mode 100644
index 0000000000000000000000000000000000000000..eafbda104646dfdab835b6e06b51c529e85263e2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DO.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[589]\\d{9}$/',
+ 'fixed' => '/^8(?:[04]9[2-9]\\d{6}|29(?:2(?:[0-59]\\d|6[04-9]|7[0-27]|8[0237-9])|3(?:[0-35-9]\\d|4[7-9])|[45]\\d{2}|6(?:[0-27-9]\\d|[3-5][1-9]|6[0135-8])|7(?:0[013-9]|[1-37]\\d|4[1-35689]|5[1-4689]|6[1-57-9]|8[1-79]|9[1-8])|8(?:0[146-9]|1[0-48]|[248]\\d|3[1-79]|5[01589]|6[013-68]|7[124-8]|9[0-8])|9(?:[0-24]\\d|3[02-46-9]|5[0-79]|60|7[0169]|8[57-9]|9[02-9]))\\d{4})$/',
+ 'mobile' => '/^8[024]9[2-9]\\d{6}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^112|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..3908120893a5dcf7ed1486561885978fb99eab66
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DZ.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '213',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:[1-4]|[5-9]\\d)\\d{7}$/',
+ 'fixed' => '/^(?:1\\d|2[014-79]|3[0-8]|4[0135689])\\d{6}|9619\\d{5}$/',
+ 'mobile' => '/^(?:5[56]|7[7-9])\\d{7}|6(?:[569]\\d|70)\\d{6}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^80[3-689]1\\d{5}$/',
+ 'shared' => '/^80[12]1\\d{5}$/',
+ 'voip' => '/^98[23]\\d{6}$/',
+ 'emergency' => '/^1[47]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shared' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EC.php
new file mode 100644
index 0000000000000000000000000000000000000000..480a9ef62fd995f1d3c2d777e32f3f5c8621158a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EC.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '593',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{9,10}|[2-8]\\d{7}|9\\d{8}$/',
+ 'fixed' => '/^[2-7][2-7]\\d{6}$/',
+ 'mobile' => '/^9(?:[2-7]9|[89]\\d)\\d{6}$/',
+ 'tollfree' => '/^1800\\d{6,7}$/',
+ 'voip' => '/^[2-7]890\\d{4}$/',
+ 'emergency' => '/^1(?:0[12]|12)|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,11}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{10,11}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EE.php
new file mode 100644
index 0000000000000000000000000000000000000000..3849ab3475f95fe1cc37c8d60fc3f1a32febbf4e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EE.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '372',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{3,4}|[3-9]\\d{6,7}|800\\d{6,7}$/',
+ 'fixed' => '/^(?:3[23589]|4(?:0\\d|[3-8])|6\\d|7[1-9]|88)\\d{5}$/',
+ 'mobile' => '/^(?:5\\d|8[1-5])\\d{6}|5(?:[02]\\d{2}|1(?:[0-8]\\d|95)|5[0-478]\\d|64[0-4]|65[1-589])\\d{3}$/',
+ 'tollfree' => '/^800(?:0\\d{3}|1\\d|[2-9])\\d{3}$/',
+ 'premium' => '/^900\\d{4}$/',
+ 'personal' => '/^70[0-2]\\d{5}$/',
+ 'uan' => '/^1(?:2[01245]|3[0-6]|4[1-489]|5[0-59]|6[1-46-9]|7[0-27-9]|8[189]|9[012])\\d{1,2}$/',
+ 'shortcode' => '/^1(?:1[13-9]|[2-9]\\d)$/',
+ 'emergency' => '/^11[02]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,10}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{7,8}$/',
+ 'tollfree' => '/^\\d{7,10}$/',
+ 'premium' => '/^\\d{7}$/',
+ 'personal' => '/^\\d{8}$/',
+ 'uan' => '/^\\d{4,5}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EG.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4d53b0bb22848436f341faecc1d8c7b940be600
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EG.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '20',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{4,9}|[2456]\\d{8}|3\\d{7}|[89]\\d{8,9}$/',
+ 'fixed' => '/^(?:1(3[23]\\d|5[23])|2[2-4]\\d{2}|3\\d{2}|4(?:0[2-5]|[578][23]|64)\\d|5(?:0[2-7]|[57][23])\\d|6[24-689]3\\d|8(?:2[2-57]|4[26]|6[237]|8[2-4])\\d|9(?:2[27]|3[24]|52|6[2356]|7[2-4])\\d)\\d{5}|1[69]\\d{3}$/',
+ 'mobile' => '/^1(?:0[01269]|1[1245]|2[0-278])\\d{7}$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'premium' => '/^900\\d{7}$/',
+ 'emergency' => '/^1(?:2[23]|80)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,10}$/',
+ 'fixed' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EH.php
new file mode 100644
index 0000000000000000000000000000000000000000..512a05c9db96850b1e8945563b15a055ae2eebf8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EH.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '212',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5689]\\d{8}$/',
+ 'fixed' => '/^528[89]\\d{5}$/',
+ 'mobile' => '/^6(?:0[0-6]|[14-7]\\d|2[2-46-9]|3[03-8]|8[01]|99)\\d{6}$/',
+ 'tollfree' => '/^80\\d{7}$/',
+ 'premium' => '/^89\\d{7}$/',
+ 'emergency' => '/^1(?:[59]|77)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ER.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ER.php
new file mode 100644
index 0000000000000000000000000000000000000000..74de1b82588535c6ef232f5012c312e64354a2a2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ER.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '291',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[178]\\d{6}$/',
+ 'fixed' => '/^1(?:1[12568]|20|40|55|6[146])\\d{4}|8\\d{6}$/',
+ 'mobile' => '/^17[1-3]\\d{4}|7\\d{6}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,7}$/',
+ 'mobile' => '/^\\d{7}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ES.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ES.php
new file mode 100644
index 0000000000000000000000000000000000000000..db0f14e8f25ce5e40227a63dbf69e63c0e95b6f3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ES.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '34',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5-9]\\d{8}$/',
+ 'fixed' => '/^8(?:[13]0|[28][0-8]|[47][1-9]|5[01346-9]|6[0457-9])\\d{6}|9(?:[1238][0-8]\\d{6}|4[1-9]\\d{6}|5\\d{7}|6(?:[0-8]\\d{6}|9(?:0(?:[0-57-9]\\d{4}|6(?:0[0-8]|1[1-9]|[2-9]\\d)\\d{2})|[1-9]\\d{5}))|7(?:[124-9]\\d{2}|3(?:[0-8]\\d|9[1-9]))\\d{4})$/',
+ 'mobile' => '/^(?:6\\d{6}|7[1-4]\\d{5}|9(?:6906(?:09|10)|7390\\d{2}))\\d{2}$/',
+ 'tollfree' => '/^[89]00\\d{6}$/',
+ 'premium' => '/^80[367]\\d{6}$/',
+ 'shared' => '/^90[12]\\d{6}$/',
+ 'personal' => '/^70\\d{7}$/',
+ 'uan' => '/^51\\d{7}$/',
+ 'emergency' => '/^0(?:[69][12]|8[05])|112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ET.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ET.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8fc7b2fda21b78ebd45aa0e2eb08229f2f1d910
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ET.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '251',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-59]\\d{8}$/',
+ 'fixed' => '/^(?:11(?:1(?:1[124]|2[2-57]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[57]|44|5[0-4])|6(?:18|2[69]|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|22[0-6]|33[0134689]|44[04]|55[0-6]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:11[1-9]|22[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}$/',
+ 'mobile' => '/^9(?:[1-3]\\d|5[89])\\d{6}$/',
+ 'emergency' => '/^9(?:11?|[23]|9[17])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FI.php
new file mode 100644
index 0000000000000000000000000000000000000000..19c4818b3c851b43fe39a52c4d02d02e05e8c2fa
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FI.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '358',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{4,11}|[2-9]\\d{4,10}$/',
+ 'fixed' => '/^1(?:[3569][1-8]\\d{3,9}|[47]\\d{5,10})|2[1-8]\\d{3,9}|3(?:[1-8]\\d{3,9}|9\\d{4,8})|[5689][1-8]\\d{3,9}$/',
+ 'mobile' => '/^4\\d{5,10}|50\\d{4,8}$/',
+ 'tollfree' => '/^800\\d{4,7}$/',
+ 'premium' => '/^[67]00\\d{5,6}$/',
+ 'uan' => '/^[13]0\\d{4,8}|2(?:0(?:[016-8]\\d{3,7}|[2-59]\\d{2,7})|9\\d{4,8})|60(?:[12]\\d{5,6}|6\\d{7})|7(?:1\\d{7}|3\\d{8}|5[03-9]\\d{2,7})$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,12}$/',
+ 'mobile' => '/^\\d{6,11}$/',
+ 'tollfree' => '/^\\d{7,10}$/',
+ 'premium' => '/^\\d{8,9}$/',
+ 'uan' => '/^\\d{5,10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FJ.php
new file mode 100644
index 0000000000000000000000000000000000000000..218d34f41835e4227b57e03e17c28ce9bfaa1533
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FJ.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '679',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[36-9]\\d{6}|0\\d{10}$/',
+ 'fixed' => '/^(?:3[0-5]|6[25-7]|8[58])\\d{5}$/',
+ 'mobile' => '/^(?:7[0-467]|8[367]|9[02346-9])\\d{5}$/',
+ 'tollfree' => '/^0800\\d{7}$/',
+ 'shortcode' => '/^0(?:04|1[34]|8[1-4])|1(?:0[1-3]|[25]9)|2[289]|30|[45]4|75|913$/',
+ 'emergency' => '/^91[17]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{4})?$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{7}$/',
+ 'tollfree' => '/^\\d{11}$/',
+ 'shortcode' => '/^\\d{2,3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FK.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ae62de11bf29817ee94a757a4f16e96b1e5a9be
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FK.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '500',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-7]\\d{4}$/',
+ 'fixed' => '/^[2-47]\\d{4}$/',
+ 'mobile' => '/^[56]\\d{4}$/',
+ 'shortcode' => '/^1\\d{2}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FM.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b466f9c5f860f01a0478d2d0f81e828e7059123
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FM.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '691',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[39]\\d{6}$/',
+ 'fixed' => '/^3[2357]0[1-9]\\d{3}|9[2-6]\\d{5}$/',
+ 'mobile' => '/^3[2357]0[1-9]\\d{3}|9[2-7]\\d{5}$/',
+ 'emergency' => '/^911|320221$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}(?:\\d{3})?$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FO.php
new file mode 100644
index 0000000000000000000000000000000000000000..40abe3e63fe1d2549031a0124cdea1840a64a9cc
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FO.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '298',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{5}$/',
+ 'fixed' => '/^(?:20|[3-4]\\d|8[19])\\d{4}$/',
+ 'mobile' => '/^(?:2[1-9]|5\\d|7[1-79])\\d{4}$/',
+ 'tollfree' => '/^80[257-9]\\d{3}$/',
+ 'premium' => '/^90(?:[1345][15-7]|2[125-7]|99)\\d{2}$/',
+ 'voip' => '/^(?:6[0-36]|88)\\d{4}$/',
+ 'shortcode' => '/^1(?:1[48]|4[124]\\d|71\\d|8[7-9]\\d)$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FR.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e36855fd4531e7f6599e716fcf630b7a22330eb
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FR.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '33',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[124-9]\\d{8}|3\\d{3}(?:\\d{5})?$/',
+ 'fixed' => '/^[1-5]\\d{8}$/',
+ 'mobile' => '/^6\\d{8}|7[5-9]\\d{7}$/',
+ 'tollfree' => '/^80\\d{7}$/',
+ 'premium' => '/^3\\d{3}|89[1-37-9]\\d{6}$/',
+ 'shared' => '/^8(?:1[019]|2[0156]|84|90)\\d{6}$/',
+ 'voip' => '/^9\\d{8}$/',
+ 'emergency' => '/^1(?:[578]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4}(?:\\d{5})?$/',
+ 'fixed' => '/^\\d{9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{4}(?:\\d{5})?$/',
+ 'shared' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php
new file mode 100644
index 0000000000000000000000000000000000000000..427944fc38fb7147e2f6859e0e24f94fb7e6d67a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '241',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[01]\\d{6,7}$/',
+ 'fixed' => '/^1\\d{6}$/',
+ 'mobile' => '/^0[2-7]\\d{6}$/',
+ 'emergency' => '/^1730|18|13\\d{2}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'emergency' => '/^\\d{2,4}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dd126f4ce7eda30368c4728cea65fea8ee7ca5a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GB.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '44',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^\\d{7,10}$/',
+ 'fixed' => '/^2(?:0[01378]|3[0189]|4[017]|8[0-46-9]|9[012])\\d{7}|1(?:(?:1(?:3[0-48]|[46][0-4]|5[012789]|7[0-49]|8[01349])|21[0-7]|31[0-8]|[459]1\\d|61[0-46-9]))\\d{6}|1(?:2(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-4789]|7[013-9]|9\\d)|3(?:0\\d|[25][02-9]|3[02-579]|[468][0-46-9]|7[1235679]|9[24578])|4(?:0[03-9]|[28][02-5789]|[37]\\d|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1235-9]|2[024-9]|3[015689]|4[02-9]|5[03-9]|6\\d|7[0-35-9]|8[0-468]|9[0-5789])|6(?:0[034689]|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0124578])|7(?:0[0246-9]|2\\d|3[023678]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-5789]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|2[02-689]|3[1-5789]|4[2-9]|5[0-579]|6[234789]|7[0124578]|8\\d|9[2-57]))\\d{6}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-4789]|8[345])))|3(?:638[2-5]|647[23]|8(?:47[04-9]|64[015789]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[123]))|5(?:24(?:3[2-79]|6\\d)|276\\d|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[567]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|955[0-4])|7(?:26(?:6[13-9]|7[0-7])|442\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|84(?:3[2-58]))|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}|176888[234678]\\d{2}|16977[23]\\d{3}$/',
+ 'mobile' => '/^7(?:[1-4]\\d\\d|5(?:0[0-8]|[13-9]\\d|2[0-35-9])|7(?:0[1-9]|[1-7]\\d|8[02-9]|9[0-689])|8(?:[014-9]\\d|[23][0-8])|9(?:[04-9]\\d|1[02-9]|2[0-35-9]|3[0-689]))\\d{6}$/',
+ 'pager' => '/^76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}$/',
+ 'tollfree' => '/^80(?:0(?:1111|\\d{6,7})|8\\d{7})|500\\d{6}$/',
+ 'premium' => '/^(?:87[123]|9(?:[01]\\d|8[2349]))\\d{7}$/',
+ 'shared' => '/^8(?:4(?:5464\\d|[2-5]\\d{7})|70\\d{7})$/',
+ 'personal' => '/^70\\d{8}$/',
+ 'voip' => '/^56\\d{8}$/',
+ 'uan' => '/^(?:3[0347]|55)\\d{8}$/',
+ 'shortcode' => '/^1(?:0[01]|1(?:1|[68]\\d{3})|2[123]|33|4(?:1|7\\d)|5\\d|70\\d|800\\d|9[15])|2(?:02|2(?:02|11|2)|3(?:02|45)|425)|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|650|789|901$/',
+ 'emergency' => '/^112|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'pager' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{7}(?:\\d{2,3})?$/',
+ 'premium' => '/^\\d{10}$/',
+ 'shared' => '/^\\d{7}(?:\\d{3})?$/',
+ 'personal' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GD.php
new file mode 100644
index 0000000000000000000000000000000000000000..91e4cc3074e6cd7da2a52474d50978d628c0ecc3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GD.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[4589]\\d{9}$/',
+ 'fixed' => '/^473(?:2(?:3[0-2]|69)|3(?:2[89]|86)|4(?:[06]8|3[5-9]|4[0-49]|5[5-79]|68|73|90)|63[68]|7(?:58|84)|938)\\d{4}$/',
+ 'mobile' => '/^473(?:4(?:0[3-79]|1[04-9]|20|58)|53[3-8])\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GE.php
new file mode 100644
index 0000000000000000000000000000000000000000..a726a95cce51a1f1e77187f294e55dc64ba4c918
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GE.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '995',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3458]\\d{8}$/',
+ 'fixed' => '/^(?:3(?:[256]\\d|4[124-9]|7[0-4])|4(?:1\\d|2[2-7]|3[1-79]|4[2-8]|7[239]|9[1-7]))\\d{6}$/',
+ 'mobile' => '/^5(?:14|5[01578]|68|7[0147-9]|9[0-35-9])\\d{6}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'emergency' => '/^0(?:11|22|33)|1(?:1[123]|22)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'fixed' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GF.php
new file mode 100644
index 0000000000000000000000000000000000000000..05ce19803b8a9ff0c4cd63fd0c3259274be84a21
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GF.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '594',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[56]\\d{8}$/',
+ 'fixed' => '/^594(?:10|2[012457-9]|3[0-57-9]|4[3-9]|5[7-9]|6[0-3]|9[014])\\d{4}$/',
+ 'mobile' => '/^694(?:[04][0-7]|1[0-5]|2[0-46-9]|38|9\\d)\\d{4}$/',
+ 'emergency' => '/^1[578]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GG.php
new file mode 100644
index 0000000000000000000000000000000000000000..753b25fcb830806bfb0d5d49a799b08e8c82d3c7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GG.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '44',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[135789]\\d{6,9}$/',
+ 'fixed' => '/^1481\\d{6}$/',
+ 'mobile' => '/^7(?:781|839|911)\\d{6}$/',
+ 'pager' => '/^76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}$/',
+ 'tollfree' => '/^80(?:0(?:1111|\\d{6,7})|8\\d{7})|500\\d{6}$/',
+ 'premium' => '/^(?:87[123]|9(?:[01]\\d|8[0-3]))\\d{7}$/',
+ 'shared' => '/^8(?:4(?:5464\\d|[2-5]\\d{7})|70\\d{7})$/',
+ 'personal' => '/^70\\d{8}$/',
+ 'voip' => '/^56\\d{8}$/',
+ 'uan' => '/^(?:3[0347]|55)\\d{8}$/',
+ 'shortcode' => '/^1(?:0[01]|1(?:1|[68]\\d{3})|23|4(?:1|7\\d)|55|800\\d|95)$/',
+ 'emergency' => '/^112|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'pager' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{7}(?:\\d{2,3})?$/',
+ 'premium' => '/^\\d{10}$/',
+ 'shared' => '/^\\d{7}(?:\\d{3})?$/',
+ 'personal' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GH.php
new file mode 100644
index 0000000000000000000000000000000000000000..006da5d1e41f440a1e3a016f31c02e6266e4d31e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GH.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '233',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[235]\\d{8}|8\\d{7}$/',
+ 'fixed' => '/^3(?:0[237]\\d|[167](?:2[0-6]|7\\d)|2(?:2[0-5]|7\\d)|3(?:2[0-3]|7\\d)|4(?:2[013-9]|3[01]|7\\d)|5(?:2[0-7]|7\\d)|8(?:2[0-2]|7\\d)|9(?:20|7\\d))\\d{5}$/',
+ 'mobile' => '/^(?:2[034678]|5[047])\\d{7}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'emergency' => '/^19[123]|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GI.php
new file mode 100644
index 0000000000000000000000000000000000000000..ca3969a35c86ccef51c7355e49ff2879a37335f5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GI.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '350',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2568]\\d{7}$/',
+ 'fixed' => '/^2(?:00\\d|16[0-7]|22[2457])\\d{4}$/',
+ 'mobile' => '/^(?:5[4-8]|60)\\d{6}$/',
+ 'tollfree' => '/^80\\d{6}$/',
+ 'premium' => '/^8[1-689]\\d{6}$/',
+ 'shared' => '/^87\\d{6}$/',
+ 'shortcode' => '/^1(?:00|1(?:6(?:00[06]|11[17])|8\\d{2})|23|4(?:1|7[014])|5[015]|9[34])|8(?:00|4[0-2]|8\\d)$/',
+ 'emergency' => '/^1(?:12|9[09])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GL.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a6e9f758376f60c93f362f2dd4f063cc39c8663
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GL.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '299',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-689]\\d{5}$/',
+ 'fixed' => '/^(?:19|3[1-6]|6[14689]|8[14-79]|9\\d)\\d{4}$/',
+ 'mobile' => '/^[245][2-9]\\d{4}$/',
+ 'tollfree' => '/^80\\d{4}$/',
+ 'voip' => '/^3[89]\\d{4}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GM.php
new file mode 100644
index 0000000000000000000000000000000000000000..82b4d218ff2e25f5d21061b2ea0866d88238f269
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GM.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '220',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{6}$/',
+ 'fixed' => '/^(?:4(?:[23]\\d{2}|4(?:1[024679]|[6-9]\\d))|5(?:54[0-7]|6(?:[67]\\d)|7(?:1[04]|2[035]|3[58]|48))|8\\d{3})\\d{3}$/',
+ 'mobile' => '/^(?:2[0-2]|[3679]\\d)\\d{5}$/',
+ 'emergency' => '/^1?1[678]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GN.php
new file mode 100644
index 0000000000000000000000000000000000000000..0c9652ddc1fe3111486e8529b9c9942f22c484f0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GN.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '224',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[23567]\\d{7,8}$/',
+ 'fixed' => '/^30(?:24|3[12]|4[1-35-7]|5[13]|6[189]|[78]1|9[1478])\\d{4}$/',
+ 'mobile' => '/^(?:24|55)\\d{6}|6(?:0(?:2[0-35-9]|3[3467]|5[2457-9])|1[0-5]\\d|2\\d{2,3}|[4-9]\\d{2}|3(?:[14]0|35))\\d{4}$/',
+ 'voip' => '/^78\\d{6}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{8}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GP.php
new file mode 100644
index 0000000000000000000000000000000000000000..91b0525bd5fdfee6b0385afac4526534b0a620d3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GP.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '590',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[56]\\d{8}$/',
+ 'fixed' => '/^590(?:1[12]|2[0-68]|3[28]|4[126-8]|5[067]|6[018]|[89]\\d)\\d{4}$/',
+ 'mobile' => '/^690(?:00|1[1-9]|2[013-5]|[3-5]\\d|6[0-57-9]|7[1-6]|8[0-6]|9[09])\\d{4}$/',
+ 'emergency' => '/^1[578]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GQ.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8b7ca8d2c049a467f6d2e5a9bc7ed013b58cf49
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GQ.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '240',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[23589]\\d{8}$/',
+ 'fixed' => '/^3(?:3(?:3\\d[7-9]|[0-24-9]\\d[46])|5\\d{2}[7-9])\\d{4}$/',
+ 'mobile' => '/^(?:222|551)\\d{6}$/',
+ 'tollfree' => '/^80\\d[1-9]\\d{5}$/',
+ 'premium' => '/^90\\d[1-9]\\d{5}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GR.php
new file mode 100644
index 0000000000000000000000000000000000000000..154fca45c89c6834ae51d7b4b1e242bfd4c1943d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GR.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '30',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[26-9]\\d{9}$/',
+ 'fixed' => '/^2(?:1\\d{2}|2(?:3[1-8]|4[1-7]|5[1-4]|6[1-8]|7[1-5]|[289][1-9])|3(?:1\\d|2[1-57]|3[1-4]|[45][1-3]|7[1-7]|8[1-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[239][1-4]|4[124]|5[1-6])|6(?:1\\d|3[124]|4[1-7]|5[13-9]|[269][1-6]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[134]|9[15-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-7]))\\d{6}$/',
+ 'mobile' => '/^69\\d{8}$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'premium' => '/^90[19]\\d{7}$/',
+ 'shared' => '/^8(?:0[16]|12|25)\\d{7}$/',
+ 'personal' => '/^70\\d{8}$/',
+ 'emergency' => '/^1(?:00|12|66|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GT.php
new file mode 100644
index 0000000000000000000000000000000000000000..f88889104931e7bb735ce04886a3bcaad9e62366
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GT.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '502',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-7]\\d{7}|1[89]\\d{9}$/',
+ 'fixed' => '/^[267][2-9]\\d{6}$/',
+ 'mobile' => '/^[345]\\d{7}$/',
+ 'tollfree' => '/^18[01]\\d{8}$/',
+ 'premium' => '/^19\\d{9}$/',
+ 'shortcode' => '/^1(?:2[124-9]|[57]\\d{2})$/',
+ 'emergency' => '/^1(?:10|2[03])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}(?:\\d{3})?$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{11}$/',
+ 'premium' => '/^\\d{11}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GU.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b68a97ff791d20783b7af5a23a34b08641235e3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GU.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5689]\\d{9}$/',
+ 'fixed' => '/^671(?:3(?:00|3[39]|4[349]|55|6[26])|4(?:56|7[1-9]|8[23678])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[5-9])|7(?:[079]7|2[0167]|3[45]|8[789])|8(?:[2-5789]8|6[48])|9(?:2[29]|6[79]|7[179]|8[789]|9[78]))\\d{4}$/',
+ 'mobile' => '/^671(?:3(?:00|3[39]|4[349]|55|6[26])|4(?:56|7[1-9]|8[23678])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[5-9])|7(?:[079]7|2[0167]|3[45]|8[789])|8(?:[2-5789]8|6[48])|9(?:2[29]|6[79]|7[179]|8[789]|9[78]))\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GW.php
new file mode 100644
index 0000000000000000000000000000000000000000..e06df20eefc9edce3d3df2a68a554fca91d731a6
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GW.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '245',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3567]\\d{6}$/',
+ 'fixed' => '/^3(?:2[0125]|3[1245]|4[12]|5[1-4]|70|9[1-467])\\d{4}$/',
+ 'mobile' => '/^[5-7]\\d{6}$/',
+ 'emergency' => '/^11[378]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GY.php
new file mode 100644
index 0000000000000000000000000000000000000000..95e9ba800fed10e14a3d5daf0868e2bfc7014e7a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GY.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '592',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-4679]\\d{6}$/',
+ 'fixed' => '/^(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-24-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|77[1-57])\\d{4}$/',
+ 'mobile' => '/^6\\d{6}$/',
+ 'tollfree' => '/^(?:289|862)\\d{4}$/',
+ 'premium' => '/^9008\\d{3}$/',
+ 'shortcode' => '/^0(?:02|171|444|7[67]7|801|9(?:0[78]|[2-47]))$/',
+ 'emergency' => '/^91[123]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..05aafbdac21a0f86186d358766d02a9f16eb241a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HK.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '852',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[235-7]\\d{7}|8\\d{7,8}|9\\d{4,10}$/',
+ 'fixed' => '/^(?:[23]\\d|5[78])\\d{6}$/',
+ 'mobile' => '/^(?:5[1-69]\\d|6\\d{2}|9(?:0[1-9]|[1-8]\\d))\\d{5}$/',
+ 'pager' => '/^7\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^900(?:[0-24-9]\\d{7}|3\\d{1,4})$/',
+ 'personal' => '/^8[1-3]\\d{6}$/',
+ 'emergency' => '/^112|99[29]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,11}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'pager' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{5,11}$/',
+ 'personal' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HN.php
new file mode 100644
index 0000000000000000000000000000000000000000..e64f974f14c8a25d356ddf89c71b2ce08151a85f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HN.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '504',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[237-9]\\d{7}$/',
+ 'fixed' => '/^2(?:2(?:0[019]|1[1-36]|[23]\\d|4[056]|5[57]|8[0146-9]|9[012])|4(?:2|3-59]|3[13-689]|4[0-68]|5[1-35])|5(?:4[3-5]|5\\d|6[56]|74)|6(?:4[0-378]|[56]\\d|[78][0-8]|9[01])|7(?:6[46-9]|7[02-9]|8[34])|8(?:79|8[0-35789]|9[1-57-9]))\\d{4}$/',
+ 'mobile' => '/^[37-9]\\d{7}$/',
+ 'emergency' => '/^199$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HR.php
new file mode 100644
index 0000000000000000000000000000000000000000..263f90ae643c052d327a116af5420ea21eec0996
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HR.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '385',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-7]\\d{5,8}|[89]\\d{6,11}$/',
+ 'fixed' => '/^1\\d{7}|(?:2[0-3]|3[1-5]|4[02-47-9]|5[1-3])\\d{6}$/',
+ 'uan' => '/^62\\d{6,7}$/',
+ 'mobile' => '/^9[1257-9]\\d{6,10}$/',
+ 'tollfree' => '/^80[01]\\d{4,7}$/',
+ 'premium' => '/^6(?:[09]\\d{7}|[145]\\d{4,7})$/',
+ 'personal' => '/^7[45]\\d{4,7}$/',
+ 'emergency' => '/^1(?:12|92)|9[34]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,12}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'uan' => '/^\\d{8,9}$/',
+ 'mobile' => '/^\\d{8,12}$/',
+ 'tollfree' => '/^\\d{7,10}$/',
+ 'premium' => '/^\\d{6,9}$/',
+ 'personal' => '/^\\d{6,9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HT.php
new file mode 100644
index 0000000000000000000000000000000000000000..e2aea06c1a1e5c497401cda7b04e5e0d447a97d4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HT.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '509',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-489]\\d{7}$/',
+ 'fixed' => '/^2(?:[24]\\d|5[1-5]|94)\\d{5}$/',
+ 'mobile' => '/^(?:3[1-9]|4\\d)\\d{6}$/',
+ 'tollfree' => '/^8\\d{7}$/',
+ 'voip' => '/^98[89]\\d{5}$/',
+ 'shortcode' => '/^1\\d{2}$/',
+ 'emergency' => '/^11[48]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HU.php
new file mode 100644
index 0000000000000000000000000000000000000000..67b44e48645e34511924cbeea033b468479d9086
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HU.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '36',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{7,8}$/',
+ 'fixed' => '/^(?:1\\d|2(?:1\\d|[2-9])|3[2-7]|4[24-9]|5[2-79]|6[23689]|7(?:1\\d|[2-9])|8[2-57-9]|9[2-69])\\d{6}$/',
+ 'mobile' => '/^(?:[27]0|3[01])\\d{7}$/',
+ 'tollfree' => '/^80\\d{6}$/',
+ 'premium' => '/^9[01]\\d{6}$/',
+ 'shared' => '/^40\\d{6}$/',
+ 'emergency' => '/^1(?:0[457]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ID.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ID.php
new file mode 100644
index 0000000000000000000000000000000000000000..553a52ee366312783fbe1e786c42fd7ed857271e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ID.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '62',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{6,10}$/',
+ 'fixed' => '/^2(?:1(?:[0-8]\\d{6,7}|9\\d{6})|[24]\\d{7,8})|(?:2(?:[35][1-4]|6[0-8]|7[1-6]|8\\d|9[1-8])|3(?:1|2[1-578]|3[1-68]|4[1-3]|5[1-8]|6[1-3568]|7[0-46]|8\\d)|4(?:0[1-589]|1[01347-9]|2[0-36-8]|3[0-24-68]|5[1-378]|6[1-5]|7[134]|8[1245])|5(?:1[1-35-9]|2[25-8]|3[1246-9]|4[1-3589]|5[1-46]|6[1-8])|6(?:19?|[25]\\d|3[1-469]|4[1-6])|7(?:1[1-46-9]|2[14-9]|[36]\\d|4[1-8]|5[1-9]|7[0-36-9])|9(?:0[12]|1[013-8]|2[0-479]|5[125-8]|6[23679]|7[159]|8[01346]))\\d{5,8}$/',
+ 'mobile' => '/^(?:2(?:1(?:3[145]|4[01]|5[1-469]|60|8[0359]|9\\d)|2(?:88|9[1256])|3[1-4]9|4(?:36|91)|5(?:1[349]|[2-4]9)|6[0-7]9|7(?:[1-36]9|4[39])|8[1-5]9|9[1-48]9)|3(?:19[1-3]|2[12]9|3[13]9|4(?:1[69]|39)|5[14]9|6(?:1[69]|2[89])|709)|4[13]19|5(?:1(?:19|8[39])|4[129]9|6[12]9)|6(?:19[12]|2(?:[23]9|77))|7(?:1[13]9|2[15]9|419|5(?:1[89]|29)|6[15]9|7[178]9))\\d{5,6}|8[1-35-9]\\d{7,9}$/',
+ 'tollfree' => '/^177\\d{6,8}|800\\d{5,7}$/',
+ 'premium' => '/^809\\d{7}$/',
+ 'emergency' => '/^11[02389]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,11}$/',
+ 'fixed' => '/^\\d{5,10}$/',
+ 'mobile' => '/^\\d{9,11}$/',
+ 'tollfree' => '/^\\d{8,11}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IE.php
new file mode 100644
index 0000000000000000000000000000000000000000..8c948c103f49b8c9e84bb4172b20e03cd35047a3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IE.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '353',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[124-9]\\d{6,9}$/',
+ 'fixed' => '/^1\\d{7,8}|2(?:1\\d{6,7}|3\\d{7}|[24-9]\\d{5})|4(?:0[24]\\d{5}|[1-469]\\d{7}|5\\d{6}|7\\d{5}|8[0-46-9]\\d{7})|5(?:0[45]\\d{5}|1\\d{6}|[23679]\\d{7}|8\\d{5})|6(?:1\\d{6}|[237-9]\\d{5}|[4-6]\\d{7})|7[14]\\d{7}|9(?:1\\d{6}|[04]\\d{7}|[35-9]\\d{5})$/',
+ 'mobile' => '/^8(?:22\\d{6}|[35-9]\\d{7})$/',
+ 'tollfree' => '/^1800\\d{6}$/',
+ 'premium' => '/^15(?:1[2-8]|[2-8]0|9[089])\\d{6}$/',
+ 'shared' => '/^18[59]0\\d{6}$/',
+ 'personal' => '/^700\\d{6}$/',
+ 'voip' => '/^76\\d{7}$/',
+ 'uan' => '/^818\\d{6}$/',
+ 'voicemail' => '/^8[35-9]\\d{8}$/',
+ 'emergency' => '/^112|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,10}$/',
+ 'fixed' => '/^\\d{5,10}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'shared' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{9}$/',
+ 'voicemail' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IL.php
new file mode 100644
index 0000000000000000000000000000000000000000..760da9e8d0b54e4c727b9d0489349f848bd59f3b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IL.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '972',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[17]\\d{6,9}|[2-589]\\d{3}(?:\\d{3,6})?|6\\d{3}$/',
+ 'fixed' => '/^[2-489]\\d{7}$/',
+ 'mobile' => '/^5(?:[02347-9]\\d{2}|5(?:2[23]|3[34]|4[45]|5[5689]|6[67]|7[78]|8[89])|6[2-9]\\d)\\d{5}$/',
+ 'tollfree' => '/^1(?:80[019]\\d{3}|255)\\d{3}$/',
+ 'premium' => '/^1(?:212|(?:9(?:0[01]|19)|200)\\d{2})\\d{4}$/',
+ 'shared' => '/^1700\\d{6}$/',
+ 'voip' => '/^7(?:2[23]\\d|3[237]\\d|47\\d|6(?:5\\d|8[08])|7\\d{2}|8(?:33|55|77|81))\\d{5}$/',
+ 'uan' => '/^[2-689]\\d{3}$/',
+ 'voicemail' => '/^1599\\d{6}$/',
+ 'shortcode' => '/^1\\d{3}$/',
+ 'emergency' => '/^1(?:0[012]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,10}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{7,10}$/',
+ 'premium' => '/^\\d{8,10}$/',
+ 'shared' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{4}$/',
+ 'voicemail' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IM.php
new file mode 100644
index 0000000000000000000000000000000000000000..51042b3b12a2c0b29d8e6f555ea16490d48683a2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IM.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '44',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[135789]\\d{6,9}$/',
+ 'fixed' => '/^1624\\d{6}$/',
+ 'mobile' => '/^7[569]24\\d{6}$/',
+ 'tollfree' => '/^808162\\d{4}$/',
+ 'premium' => '/^(?:872299|90[0167]624)\\d{4}$/',
+ 'shared' => '/^8(?:4(?:40[49]06|5624\\d)|70624\\d)\\d{3}$/',
+ 'personal' => '/^70\\d{8}$/',
+ 'voip' => '/^56\\d{8}$/',
+ 'uan' => '/^3(?:08162\\d|3\\d{5}|4(?:40[49]06|5624\\d)|7(?:0624\\d|2299\\d))\\d{3}|55\\d{8}$/',
+ 'shortcode' => '/^1\\d{2}(?:\\d{3})?$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'shared' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..5fd4c46a76d2f80d2b54d27b64aa661cfc09ab27
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IN.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '91',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{7,12}|[2-9]\\d{9,10}$/',
+ 'fixed' => '/^(?:11|2[02]|33|4[04]|79)[2-7]\\d{7}|80[2-467]\\d{7}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[126-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:[136][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[13-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1-5]|4[25-8]|5[125689]|6[235-7]|7[157-9]|8[2-467])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|[57][2-689]|6[24-58]|8[1-6])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d|7(?:(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|9\\d)\\d|8(?:2[0-6]|[013-8]\\d)))[2-7]\\d{5}$/',
+ 'mobile' => '/^(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|7[7-9]|8[1-9]|9[05-9])|8(?:[03][07-9]|14|2[7-9]|[4-7]\\d|9[013-9]))|8(?:0(?:[01589]\\d|6[67])|1(?:[02-589]\\d|1[0135-9]|7[0-79])|2(?:[236-9]\\d|5[1-9])|3(?:[037-9]\\d|4[1-9]|5[0-37-9])|[45]\\d{2}|6[02457-9]\\d|7[1-69]\\d|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))|9\\d{3})\\d{6}$/',
+ 'tollfree' => '/^1(?:600\\d{6}|80(?:0\\d{4,8}|3\\d{9}))$/',
+ 'premium' => '/^186[12]\\d{9}$/',
+ 'uan' => '/^1860\\d{7}$/',
+ 'emergency' => '/^1(?:0[0128]|12|298)|2611$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,13}$/',
+ 'fixed' => '/^\\d{6,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{8,13}$/',
+ 'premium' => '/^\\d{13}$/',
+ 'uan' => '/^\\d{11}$/',
+ 'emergency' => '/^\\d{3,4}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IO.php
new file mode 100644
index 0000000000000000000000000000000000000000..8ae9ad89a506ea3ac2fa076dc77000ba5b9f33ca
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IO.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '246',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^3\\d{6}$/',
+ 'fixed' => '/^37\\d{5}$/',
+ 'mobile' => '/^38\\d{5}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IQ.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ff6179f13869a7e339e96e0d656273594be3694
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IQ.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '964',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-7]\\d{7,9}$/',
+ 'fixed' => '/^1\\d{7}|(?:2[13-5]|3[02367]|4[023]|5[03]|6[026])\\d{6,7}$/',
+ 'mobile' => '/^7[3-9]\\d{8}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{10}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IR.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3e77e70258dd04e775fdf9a3cd7eaa87d96506f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IR.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '98',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-6]\\d{4,9}|9(?:[1-4]\\d{8}|9\\d{2,8})|[178]\\d{9}$/',
+ 'fixed' => '/^2(?:1[2-9]\\d{2,7}|51\\d{3,7})|(?:241|3(?:11|51)|441|5[14]1)\\d{4,7}|(?:3(?:34|41)|6(?:11|52))\\d{6,7}|(?:1(?:[134589][12]|[27][1-4])|2(?:2[189]|[389][12]|42|5[256]|6[1-59]|7[34])|3(?:12|2[1-4]|3[125]|4[24-9]|5[23]|[6-9][12])|4(?:[135-9][12]|2[1-467]|4[2-4])|5(?:12|2[89]|3[1-5]|4[2-8]|[5-7][12]|8[1245])|6(?:12|[347-9][12]|51|6[1-6])|7(?:[13589][12]|2[1289]|4[1-4]|6[1-6]|7[1-3])|8(?:[145][12]|3[124578]|6[1256]|7[1245]))\\d{7}$/',
+ 'mobile' => '/^9(?:1(?:[039]\\d|[16][1-35-9]|2[1-8]|4[013-9]|[57][1-9]|8[13-9])|2[01]\\d|3(?:[035-9]\\d|13|2[1-579]|47))\\d{6}$/',
+ 'pager' => '/^943[24678]\\d{6}$/',
+ 'voip' => '/^993[12]\\d{6}$/',
+ 'uan' => '/^9990\\d{0,6}$/',
+ 'emergency' => '/^1(?:1[025]|25)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,10}$/',
+ 'fixed' => '/^\\d{5,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'pager' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IS.php
new file mode 100644
index 0000000000000000000000000000000000000000..ead710e67674df0d4df08782893b4b4be67013a3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IS.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '354',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[4-9]\\d{6}|38\\d{7}$/',
+ 'fixed' => '/^(?:4(?:[14][0-245]|2[0-7]|[37][0-8]|5[0-3568]|6\\d|8[0-36-8])|5(?:05|[156]\\d|2[02578]|3[013-7]|4[03-7]|7[0-2578]|8[0-35-9]|9[013-689])|87[23])\\d{4}$/',
+ 'mobile' => '/^38[59]\\d{6}|(?:6(?:1[0-8]|3[0-27-9]|4[0-27]|5[0-29]|[67][0-69]|9\\d)|7(?:5[057]|7\\d|8[0-3])|8(?:2[0-5]|[469]\\d|5[1-9]))\\d{4}$/',
+ 'tollfree' => '/^800\\d{4}$/',
+ 'premium' => '/^90\\d{5}$/',
+ 'voip' => '/^49[0-24-79]\\d{4}$/',
+ 'voicemail' => '/^388\\d{6}|(?:6(?:2[0-8]|49|8\\d)|8(?:2[6-9]|[38]\\d|50|7[014-9])|95[48])\\d{4}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'tollfree' => '/^\\d{7}$/',
+ 'premium' => '/^\\d{7}$/',
+ 'voip' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IT.php
new file mode 100644
index 0000000000000000000000000000000000000000..e20abce526e83026b7782095372a6bc3865fe841
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IT.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '39',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[01589]\\d{5,10}|3(?:[12457-9]\\d{8}|[36]\\d{7,9})$/',
+ 'fixed' => '/^0(?:[26]\\d{4,9}|(?:1(?:[0159]\\d|[27][1-5]|31|4[1-4]|6[1356]|8[2-57])|3(?:[0159]\\d|2[1-4]|3[12]|[48][1-6]|6[2-59]|7[1-7])|4(?:[0159]\\d|[23][1-9]|4[245]|6[1-5]|7[1-4]|81)|5(?:[0159]\\d|2[1-5]|3[2-6]|4[1-79]|6[4-6]|7[1-578]|8[3-8])|7(?:[0159]\\d|2[12]|3[1-7]|4[2346]|6[13569]|7[13-6]|8[1-59])|8(?:[0159]\\d|2[34578]|3[1-356]|[6-8][1-5])|9(?:[0159]\\d|[238][1-5]|4[12]|6[1-8]|7[1-6]))\\d{2,7})$/',
+ 'mobile' => '/^3(?:[12457-9]\\d{8}|6\\d{7,8}|3\\d{7,9})$/',
+ 'tollfree' => '/^80(?:0\\d{6}|3\\d{3})$/',
+ 'premium' => '/^0878\\d{5}|1(?:44|6[346])\\d{6}|89(?:2\\d{3}|4(?:[0-4]\\d{2}|[5-9]\\d{4})|5(?:[0-4]\\d{2}|[5-9]\\d{6})|9\\d{6})$/',
+ 'shared' => '/^84(?:[08]\\d{6}|[17]\\d{3})$/',
+ 'personal' => '/^1(?:78\\d|99)\\d{6}$/',
+ 'voip' => '/^55\\d{8}$/',
+ 'shortcode' => '/^1(?:1(?:[47]|6\\d{3})|2\\d{2}|4(?:82|9\\d{1,3})|5(?:00|1[58]|2[25]|3[03]|44)|86|9(?:2(?:[01]\\d{2}|[2-9]\\d)|4\\d|696))$/',
+ 'emergency' => '/^11[2358]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,11}$/',
+ 'fixed' => '/^\\d{6,11}$/',
+ 'mobile' => '/^\\d{9,11}$/',
+ 'tollfree' => '/^\\d{6,9}$/',
+ 'premium' => '/^\\d{6,10}$/',
+ 'shared' => '/^\\d{6,9}$/',
+ 'personal' => '/^\\d{9,10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JE.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1bad4dffe3ba05f9136b7eb7a615987dd3c159e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JE.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '44',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[135789]\\d{6,9}$/',
+ 'fixed' => '/^1534\\d{6}$/',
+ 'mobile' => '/^7(?:509|7(?:00|97)|829|937)\\d{6}$/',
+ 'pager' => '/^76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}$/',
+ 'tollfree' => '/^80(?:07(?:35|81)|8901)\\d{4}$/',
+ 'premium' => '/^(?:871206|90(?:066[59]|1810|71(?:07|55)))\\d{4}$/',
+ 'shared' => '/^8(?:4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|70002)\\d{4}$/',
+ 'personal' => '/^701511\\d{4}$/',
+ 'voip' => '/^56\\d{8}$/',
+ 'uan' => '/^3(?:0(?:07(?:35|81)|8901)|3\\d{4}|4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))\\d{4}|55\\d{8}$/',
+ 'shortcode' => '/^1(?:00|18\\d{3}|23|4(?:[14]|28|7\\d)|5\\d|7(?:0[12]|[128]|35?)|808|9[135])|23[234]$/',
+ 'emergency' => '/^112|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'pager' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'shared' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JM.php
new file mode 100644
index 0000000000000000000000000000000000000000..aaa942026d8adbf1d17db16fadcb8c50bb14a7f9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JM.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[589]\\d{9}$/',
+ 'fixed' => '/^876(?:5(?:0[12]|1[0-468]|2[35]|63)|6(?:0[1-3579]|1[027-9]|[23]\\d|40|5[06]|6[2-489]|7[05]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468]))\\d{4}$/',
+ 'mobile' => '/^876(?:2[1789]\\d|[348]\\d{2}|5(?:08|27|6[0-24-9]|[3-578]\\d)|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579]))\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^11[09]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JO.php
new file mode 100644
index 0000000000000000000000000000000000000000..2210b9ce397e5b358cc24a9ff010194672a575a7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JO.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '962',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[235-9]\\d{7,8}$/',
+ 'fixed' => '/^(?:2(?:6(?:2[0-35-9]|3[0-57-8]|4[24-7]|5[0-24-8]|[6-9][02])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|[457][02]|60)|53(?:[013][02]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2[50]0|300|4(?:0[0125]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[17-8]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[02-39]))|87(?:[02]0|7[08]|9[09]))\\d{4}$/',
+ 'mobile' => '/^7(?:55|7[25-9]|8[5-9]|9[05-9])\\d{6}$/',
+ 'pager' => '/^74(?:66|77)\\d{5}$/',
+ 'tollfree' => '/^80\\d{6}$/',
+ 'premium' => '/^900\\d{5}$/',
+ 'shared' => '/^85\\d{6}$/',
+ 'personal' => '/^70\\d{7}$/',
+ 'uan' => '/^8(?:10|8\\d)\\d{5}$/',
+ 'shortcode' => '/^1(?:09|1[01]|9[024-79])$/',
+ 'emergency' => '/^1(?:12|91)|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'pager' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JP.php
new file mode 100644
index 0000000000000000000000000000000000000000..45c1ed94bca3dd249f3479e80135a3e9f87a6130
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JP.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '81',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{8,9}|0(?:[36]\\d{7,14}|7\\d{5,7}|8\\d{7})$/',
+ 'fixed' => '/^(?:1(?:1[235-8]|2[3-6]|3[3-9]|4[2-6]|[58][2-8]|6[2-7]|7[2-9]|9[1-9])|2[2-9]\\d|[36][1-9]\\d|4(?:6[02-8]|[2-578]\\d|9[2-59])|5(?:6[1-9]|7[2-8]|[2-589]\\d)|7(?:3[4-9]|4[02-9]|[25-9]\\d)|8(?:3[2-9]|4[5-9]|5[1-9]|8[03-9]|[2679]\\d)|9(?:[679][1-9]|[2-58]\\d))\\d{6}$/',
+ 'mobile' => '/^(?:[79]0\\d|80[1-9])\\d{7}$/',
+ 'pager' => '/^20\\d{8}$/',
+ 'tollfree' => '/^120\\d{6}|800\\d{7}|0(?:37\\d{6,13}|66\\d{6,13}|777(?:[01]\\d{2}|5\\d{3}|8\\d{4})|882[1245]\\d{4})$/',
+ 'premium' => '/^990\\d{6}$/',
+ 'personal' => '/^60\\d{7}$/',
+ 'voip' => '/^50\\d{8}$/',
+ 'uan' => '/^570\\d{6}$/',
+ 'emergency' => '/^11[09]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,16}$/',
+ 'fixed' => '/^\\d{9}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'pager' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{7,16}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KE.php
new file mode 100644
index 0000000000000000000000000000000000000000..50cf07b73c42026f478c015abed20b6e45266998
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KE.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '254',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^20\\d{6,7}|[4-9]\\d{6,9}$/',
+ 'fixed' => '/^20\\d{6,7}|4(?:[013]\\d{7}|[24-6]\\d{5,7})|5(?:[0-36-8]\\d{5,7}|[459]\\d{5})|6(?:[08]\\d{5}|[14-79]\\d{5,7}|2\\d{7})$/',
+ 'mobile' => '/^7(?:0[0-8]|[123]\\d|5[0-6]|7[0-5]|8[5-9])\\d{6}$/',
+ 'tollfree' => '/^800[24-8]\\d{5,6}$/',
+ 'premium' => '/^900[02-578]\\d{5}$/',
+ 'shortcode' => '/^1(?:0[09]|1(?:[06]|9[0-2579])|2[13]|3[01])$/',
+ 'emergency' => '/^112|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,10}$/',
+ 'fixed' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9,10}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KG.php
new file mode 100644
index 0000000000000000000000000000000000000000..f9ab2ce9222e50057650e309815fa53d4f2b3117
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KG.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '996',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[35-8]\\d{8,9}$/',
+ 'fixed' => '/^(?:3(?:1(?:2\\d|3[1-9]|47|5[02]|6[1-8])|2(?:22|3[0-479]|6[0-7])|4(?:22|5[6-9]|6[0-4])|5(?:22|3[4-7]|59|6[0-5])|6(?:22|5[35-7]|6[0-3])|7(?:22|3[468]|4[1-9]|59|6\\d|7[5-7])|9(?:22|4[1-8]|6[0-8]))|6(?:09|12|2[2-4])\\d)\\d{5}$/',
+ 'mobile' => '/^5[124-7]\\d{7}|7(?:0[0-357-9]|7\\d)\\d{6}$/',
+ 'tollfree' => '/^800\\d{6,7}$/',
+ 'emergency' => '/^10[123]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,10}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9,10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KH.php
new file mode 100644
index 0000000000000000000000000000000000000000..848fdb927a86e8cfb6a14ca6d96b57d2a82f6b80
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KH.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '855',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{7,9}$/',
+ 'fixed' => '/^(?:2[3-6]|3[2-6]|4[2-4]|[567][2-5])(?:[2-47-9]|5\\d|6\\d?)\\d{5}$/',
+ 'mobile' => '/^(?:(?:1\\d|6[06-9]|7(?:[07-9]|6\\d))[1-9]|8(?:0[89]|[134679]\\d|5[2-689]|8\\d{2})|9(?:[0-589][1-9]|[67][1-9]\\d?))\\d{5}$/',
+ 'tollfree' => '/^1800(?:1\\d|2[019])\\d{4}$/',
+ 'premium' => '/^1900(?:1\\d|2[09])\\d{4}$/',
+ 'emergency' => '/^11[789]|666$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{8,9}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KI.php
new file mode 100644
index 0000000000000000000000000000000000000000..48a88b6fe120d7de2721b29f994bdef7079ea4df
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KI.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '686',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-689]\\d{4}$/',
+ 'fixed' => '/^(?:[234]\\d|50|8[1-5])\\d{3}$/',
+ 'mobile' => '/^6\\d{4}|9(?:[0-8]\\d|9[015-8])\\d{2}$/',
+ 'shortcode' => '/^10(?:[0-8]|5[01259])$/',
+ 'emergency' => '/^99[2349]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KM.php
new file mode 100644
index 0000000000000000000000000000000000000000..6eab46bec2e4684918bfe99535360503160eeab5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KM.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '269',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[379]\\d{6}$/',
+ 'fixed' => '/^7(?:6[0-37-9]|7[0-57-9])\\d{4}$/',
+ 'mobile' => '/^3[234]\\d{5}$/',
+ 'premium' => '/^(?:39[01]|9[01]0)\\d{4}$/',
+ 'emergency' => '/^1[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KN.php
new file mode 100644
index 0000000000000000000000000000000000000000..b7ff1c84e917cd623c22e7850dd23258d2d8fa77
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KN.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[589]\\d{9}$/',
+ 'fixed' => '/^869(?:2(?:29|36)|302|4(?:6[5-9]|70))\\d{4}$/',
+ 'mobile' => '/^869(?:5(?:5[6-8]|6[5-7])|66\\d|76[02-6])\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^333|9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KP.php
new file mode 100644
index 0000000000000000000000000000000000000000..dddbdccac4356565556ddeac1ea652f7953fb106
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KP.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '850',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{9}|[28]\\d{7}$/',
+ 'fixed' => '/^2\\d{7}|85\\d{6}$/',
+ 'mobile' => '/^19[123]\\d{7}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,8}|\\d{10}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'mobile' => '/^\\d{10}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KR.php
new file mode 100644
index 0000000000000000000000000000000000000000..5457668f7d40a803404368f8ef8d22855b5523b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KR.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '82',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-7]\\d{3,9}|8\\d{8}$/',
+ 'fixed' => '/^(?:2|[34][1-3]|5[1-5]|6[1-4])(?:1\\d{2,3}|[2-9]\\d{6,7})$/',
+ 'mobile' => '/^1[0-25-9]\\d{7,8}$/',
+ 'tollfree' => '/^80\\d{7}$/',
+ 'premium' => '/^60[2-9]\\d{6}$/',
+ 'personal' => '/^50\\d{8}$/',
+ 'voip' => '/^70\\d{8}$/',
+ 'uan' => '/^1(?:5(?:44|66|77|88|99)|6(?:00|44|6[16]|70|88))\\d{4}$/',
+ 'emergency' => '/^11[29]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,10}$/',
+ 'fixed' => '/^\\d{4,10}$/',
+ 'mobile' => '/^\\d{9,10}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KW.php
new file mode 100644
index 0000000000000000000000000000000000000000..81f4cb5f8986ae2d56cd58c413b6a6ff41bcbc12
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KW.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '965',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[12569]\\d{6,7}$/',
+ 'fixed' => '/^(?:18\\d|2(?:[23]\\d{2}|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}$/',
+ 'mobile' => '/^(?:5(?:11|[05]\\d)|6(?:0[034679]|5[015-9]|6\\d|7[067]|9[069])|9(?:0[09]|4[049]|6[69]|[79]\\d))\\d{5}$/',
+ 'shortcode' => '/^1(?:[02-9]\\d|1[013-9])$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KY.php
new file mode 100644
index 0000000000000000000000000000000000000000..d8216e580edc77a5ccaa5bd2f70801e248b59a22
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KY.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3589]\\d{9}$/',
+ 'fixed' => '/^345(?:2(?:22|44)|444|6(?:23|38|40)|7(?:4[35-79]|6[6-9]|77)|8(?:00|1[45]|25|[48]8)|9(?:14|4[035-9]))\\d{4}$/',
+ 'mobile' => '/^345(?:32[1-9]|5(?:1[67]|2[5-7]|4[6-8]|76)|9(?:1[67]|2[3-9]|3[689]))\\d{4}$/',
+ 'pager' => '/^345849\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}|345976\\d{4}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'pager' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..922979402694ebc2fa4a85d45833d1fc6eb1c68e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KZ.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '7',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:33\\d|7\\d{2}|80[09])\\d{7}$/',
+ 'fixed' => '/^33622\\d{5}|7(?:1(?:0(?:[23]\\d|4[023]|59|63)|1(?:[23]\\d|4[0-79]|59)|2(?:[23]\\d|59)|3(?:2\\d|3[1-79]|4[0-35-9]|59)|4(?:2\\d|3[013-79]|4[0-8]|5[1-79])|5(?:2\\d|3[1-8]|4[1-7]|59)|6(?:[234]\\d|5[19]|61)|72\\d|8(?:[27]\\d|3[1-46-9]|4[0-5]))|2(?:1(?:[23]\\d|4[46-9]|5[3469])|2(?:2\\d|3[0679]|46|5[12679])|3(?:[234]\\d|5[139])|4(?:2\\d|3[1235-9]|59)|5(?:[23]\\d|4[01246-8]|59|61)|6(?:2\\d|3[1-9]|4[0-4]|59)|7(?:[237]\\d|40|5[279])|8(?:[23]\\d|4[0-3]|59)|9(?:2\\d|3[124578]|59)))\\d{5}$/',
+ 'mobile' => '/^7(?:0[01257]|6[02-4]|7[1578]|85)\\d{7}$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'premium' => '/^809\\d{7}$/',
+ 'voip' => '/^751\\d{7}$/',
+ 'emergency' => '/^1(?:0[123]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LA.php
new file mode 100644
index 0000000000000000000000000000000000000000..836b2911d8b89d09259bec5afecc81a6f854fdfd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LA.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '856',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-8]\\d{7,9}$/',
+ 'fixed' => '/^(?:2[13]|[35-7][14]|41|8[1468])\\d{6}$/',
+ 'mobile' => '/^20(?:2[2389]|5[4-689]|7[6-8]|9[57-9])\\d{6}$/',
+ 'emergency' => '/^19[015]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LB.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec585da3e3807b9af4d7d30406ec2b07150b2af4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LB.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '961',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[13-9]\\d{6,7}$/',
+ 'fixed' => '/^(?:[14-6]\\d{2}|7(?:[2-579]\\d|62|8[0-7])|[89][2-9]\\d)\\d{4}$/',
+ 'mobile' => '/^(?:3\\d|7(?:[01]\\d|6[013-9]|8[89]|91))\\d{5}$/',
+ 'premium' => '/^9[01]\\d{6}$/',
+ 'shared' => '/^8[01]\\d{6}$/',
+ 'emergency' => '/^1(?:12|40|75)|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{7,8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LC.php
new file mode 100644
index 0000000000000000000000000000000000000000..7d59ef7768efd078254148fa48cfed4d8ed19835
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LC.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5789]\\d{9}$/',
+ 'fixed' => '/^758(?:234|4(?:30|5[0-9]|6[2-9]|8[0-2])|572|638|758)\\d{4}$/',
+ 'mobile' => '/^758(?:28[4-7]|384|4(?:6[01]|8[4-9])|5(?:1[89]|20|84)|7(?:1[2-9]|2[0-6]))\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LI.php
new file mode 100644
index 0000000000000000000000000000000000000000..a36053f62958f77309dcd0fceac4a5ca2cda6e03
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LI.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '423',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^6\\d{8}|[23789]\\d{6}$/',
+ 'fixed' => '/^(?:2(?:01|1[27]|3\\d|6[02-578]|96)|3(?:7[0135-7]|8[048]|9[0269]))\\d{4}$/',
+ 'mobile' => '/^6(?:51[01]|6(?:[01][0-4]|2[016-9]|88)|710)\\d{5}|7(?:36|4[25]|56|[7-9]\\d)\\d{4}$/',
+ 'tollfree' => '/^80(?:0(?:2[238]|79)|9\\d{2})\\d{2}$/',
+ 'premium' => '/^90(?:0(?:2[278]|79)|1(?:23|3[012])|6(?:4\\d|6[0126]))\\d{2}$/',
+ 'uan' => '/^87(?:0[128]|7[0-4])\\d{3}$/',
+ 'voicemail' => '/^697(?:[35]6|4[25]|[7-9]\\d)\\d{4}$/',
+ 'personal' => '/^701\\d{4}$/',
+ 'shortcode' => '/^1(?:145|4(?:[0357]|14)|50\\d{4}|6(?:00|[1-4])|75|8(?:1[128]|7))$/',
+ 'emergency' => '/^1(?:1[278]|44)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'tollfree' => '/^\\d{7}$/',
+ 'premium' => '/^\\d{7}$/',
+ 'uan' => '/^\\d{7}$/',
+ 'voicemail' => '/^\\d{9}$/',
+ 'personal' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LK.php
new file mode 100644
index 0000000000000000000000000000000000000000..7486a4520462ecb6a8b606de69a925090b60e2f3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LK.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '94',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{8}$/',
+ 'fixed' => '/^(?:[189]1|2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7])[2-57]\\d{6}$/',
+ 'mobile' => '/^7[125-8]\\d{7}$/',
+ 'emergency' => '/^11[0189]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LR.php
new file mode 100644
index 0000000000000000000000000000000000000000..33bd6a69877caf6dc127ca822b05785413e10a0a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LR.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '231',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:[29]\\d|[4-6]|7\\d{1,2}|[38]\\d{2})\\d{6}$/',
+ 'fixed' => '/^2\\d{7}$/',
+ 'mobile' => '/^(?:4[67]|5\\d|6[4-8]|7(?:7[67]\\d|\\d{2})|88\\d{2})\\d{5}$/',
+ 'premium' => '/^90\\d{6}$/',
+ 'voip' => '/^33200\\d{4}$/',
+ 'emergency' => '/^355|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LS.php
new file mode 100644
index 0000000000000000000000000000000000000000..af1219570dafa94f725397da84c12c5f5b237ccd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LS.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '266',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2568]\\d{7}$/',
+ 'fixed' => '/^2\\d{7}$/',
+ 'mobile' => '/^[56]\\d{7}$/',
+ 'tollfree' => '/^800[256]\\d{4}$/',
+ 'emergency' => '/^11[257]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LT.php
new file mode 100644
index 0000000000000000000000000000000000000000..5483a8510c6c37dc6101e6a942b00552a28f6010
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LT.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '370',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3-9]\\d{7}$/',
+ 'fixed' => '/^(?:3[1478]|4[124-6]|52)\\d{6}$/',
+ 'mobile' => '/^6\\d{7}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^9(?:0[0239]|10)\\d{5}$/',
+ 'personal' => '/^700\\d{5}$/',
+ 'shared' => '/^808\\d{5}$/',
+ 'uan' => '/^70[67]\\d{5}$/',
+ 'emergency' => '/^0(?:11?|22?|33?)|1(?:0[123]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LU.php
new file mode 100644
index 0000000000000000000000000000000000000000..c42cb7be0d85c7f4c1718f0405ff89a56529195f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LU.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '352',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[24-9]\\d{3,10}|3(?:[0-46-9]\\d{2,9}|5[013-9]\\d{1,8})$/',
+ 'fixed' => '/^(?:2(?:2\\d{1,2}|3[2-9]|[67]\\d|4[1-8]\\d?|5[1-5]\\d?|9[0-24-9]\\d?)|3(?:[059][05-9]|[13]\\d|[26][015-9]|4[0-26-9]|7[0-389]|8[08])\\d?|4\\d{2,3}|5(?:[01458]\\d|[27][0-69]|3[0-3]|[69][0-7])\\d?|7(?:1[019]|2[05-9]|3[05]|[45][07-9]|[679][089]|8[06-9])\\d?|8(?:0[2-9]|1[0-36-9]|3[3-9]|[469]9|[58][7-9]|7[89])\\d?|9(?:0[89]|2[0-49]|37|49|5[0-27-9]|7[7-9]|9[0-478])\\d?)\\d{1,7}$/',
+ 'mobile' => '/^6[269][18]\\d{6}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^90[01]\\d{5}$/',
+ 'shared' => '/^801\\d{5}$/',
+ 'personal' => '/^70\\d{6}$/',
+ 'voip' => '/^20\\d{2,8}$/',
+ 'shortcode' => '/^12\\d{3}$/',
+ 'emergency' => '/^11[23]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,11}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'personal' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{4,10}$/',
+ 'shortcode' => '/^\\d{3,5}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LV.php
new file mode 100644
index 0000000000000000000000000000000000000000..efbe4507a0a2a966cfe1ea672b86cae1174595c3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LV.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '371',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2689]\\d{7}$/',
+ 'fixed' => '/^6[3-8]\\d{6}$/',
+ 'mobile' => '/^2\\d{7}$/',
+ 'tollfree' => '/^80\\d{6}$/',
+ 'premium' => '/^90\\d{6}$/',
+ 'shared' => '/^81\\d{6}$/',
+ 'emergency' => '/^0[123]|112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LY.php
new file mode 100644
index 0000000000000000000000000000000000000000..ccaade2ebae3b3ec1964810976354efb430a8873
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LY.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '218',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[25679]\\d{8}$/',
+ 'fixed' => '/^(?:2[1345]|5[1347]|6[123479]|71)\\d{7}$/',
+ 'mobile' => '/^9[1-6]\\d{7}$/',
+ 'emergency' => '/^19[013]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MA.php
new file mode 100644
index 0000000000000000000000000000000000000000..7daeb65c8bb079b8bf34e764f00954d94d331845
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MA.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '212',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5689]\\d{8}$/',
+ 'fixed' => '/^5(?:2(?:(?:[015-7]\\d|2[2-9]|3[2-57]|4[2-8]|8[235-7])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}$/',
+ 'mobile' => '/^6(?:0[0-6]|[14-7]\\d|2[2-46-9]|3[03-8]|8[01]|99)\\d{6}$/',
+ 'tollfree' => '/^80\\d{7}$/',
+ 'premium' => '/^89\\d{7}$/',
+ 'emergency' => '/^1(?:[59]|77)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MC.php
new file mode 100644
index 0000000000000000000000000000000000000000..48f2a7ff30e13900c88d2b36348c12f8c0ed20bf
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MC.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '377',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[4689]\\d{7,8}$/',
+ 'fixed' => '/^9[2-47-9]\\d{6}$/',
+ 'mobile' => '/^6\\d{8}|4\\d{7}$/',
+ 'tollfree' => '/^(?:8\\d|90)\\d{6}$/',
+ 'emergency' => '/^1(?:12|[578])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MD.php
new file mode 100644
index 0000000000000000000000000000000000000000..3166f00e0eb5e5b02fde52724ee2e8f36ad8df7d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MD.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '373',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[235-9]\\d{7}$/',
+ 'fixed' => '/^(?:2(?:1[0569]|2\\d|3[015-7]|4[1-46-9]|5[0-24689]|6[2-589]|7[1-37]|9[1347-9])|5(?:33|5[257]))\\d{5}$/',
+ 'mobile' => '/^(?:562|6(?:50|7[1-5]|[089]\\d)|7(?:7[47-9]|[89]\\d))\\d{5}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^90[056]\\d{5}$/',
+ 'shared' => '/^808\\d{5}$/',
+ 'uan' => '/^8(?:03|14)\\d{5}$/',
+ 'voip' => '/^3[08]\\d{6}$/',
+ 'shortcode' => '/^1(?:1(?:[79]|6(?:000|1(?:11|23))|8\\d)|4\\d{3}|5[0-3]\\d|6[0-389]\\d|8\\d{2}|9(?:0[04-9]|[1-4]\\d))$/',
+ 'emergency' => '/^112|90[123]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ME.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ME.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b2a2610b30aded68ea3abbb7bc2b1a04b9961d0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ME.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '382',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{7,8}$/',
+ 'fixed' => '/^(?:20[2-8]|3(?:0[2-7]|1[35-7]|2[3567]|3[4-7])|4(?:0[237]|1[27])|5(?:0[47]|1[27]|2[378]))\\d{5}$/',
+ 'mobile' => '/^6(?:32\\d|[89]\\d{2}|7(?:[0-8]\\d|9(?:[3-9]|[0-2]\\d)))\\d{4}$/',
+ 'tollfree' => '/^800[28]\\d{4}$/',
+ 'premium' => '/^(?:88\\d|9(?:4[13-8]|5[16-8]))\\d{5}$/',
+ 'voip' => '/^78[1-9]\\d{5}$/',
+ 'uan' => '/^77\\d{6}$/',
+ 'shortcode' => '/^1(?:16\\d{3}|2(?:[015-9]|\\d{2})|[0135]\\d{2}|4\\d{2,3}|9\\d{3})$/',
+ 'emergency' => '/^1(?:12|2[234])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'mobile' => '/^\\d{8,9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'uan' => '/^\\d{8}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MF.php
new file mode 100644
index 0000000000000000000000000000000000000000..3997e4301708854a30427e1c5a197b20168a2e57
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MF.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '590',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[56]\\d{8}$/',
+ 'fixed' => '/^590(?:10|2[79]|5[128]|[78]7)\\d{4}$/',
+ 'mobile' => '/^690(?:10|2[27]|66|77|8[78])\\d{4}$/',
+ 'emergency' => '/^1[578]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MG.php
new file mode 100644
index 0000000000000000000000000000000000000000..222ddb63b805ebae67d174795d8976bf8511dfae
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MG.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '261',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[23]\\d{8}$/',
+ 'fixed' => '/^2(?:0(?:(?:2\\d|4[47]|5[3467]|6[279]|8[268]|9[245])\\d|7(?:2[29]|[35]\\d))|210\\d)\\d{4}$/',
+ 'mobile' => '/^3[02-4]\\d{7}$/',
+ 'emergency' => '/^11?[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MH.php
new file mode 100644
index 0000000000000000000000000000000000000000..95302768aa3676c3ab30a7bc94bd08fc681033c9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MH.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '692',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-6]\\d{6}$/',
+ 'fixed' => '/^(?:247|528|625)\\d{4}$/',
+ 'mobile' => '/^(?:235|329|45[56]|545)\\d{4}$/',
+ 'voip' => '/^635\\d{4}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MK.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b18538c1706df8fe1900e5acc5b50335e93bf67
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MK.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '389',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-578]\\d{7}$/',
+ 'fixed' => '/^(?:2(?:[23]\\d|5[124578]|6[01])|3(?:1[3-6]|[23][2-6]|4[2356])|4(?:[23][2-6]|4[3-6]|5[256]|6[25-8]|7[24-6]|8[4-6]))\\d{5}$/',
+ 'mobile' => '/^7(?:[0-25-8]\\d|33)\\d{5}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^5[02-9]\\d{6}$/',
+ 'shared' => '/^8(?:0[1-9]|[1-9]\\d)\\d{5}$/',
+ 'emergency' => '/^1(?:12|9[234])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ML.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ML.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc85a6b300a2be5645ba1f556fb86dabef18aaa7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ML.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '223',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[246-8]\\d{7}$/',
+ 'fixed' => '/^(?:2(?:0(?:2[0-589]|7[027-9])|1(?:2[5-7]|[3-689]\\d))|44[239]\\d)\\d{4}$/',
+ 'mobile' => '/^(?:6[3569]|7\\d)\\d{6}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'emergency' => '/^1[578]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f88eadd449a42f4e02c814761d69b007b5e3037
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MM.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '95',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[14578]\\d{5,7}|[26]\\d{5,8}|9(?:[258]|4\\d{1,2}|[679]\\d?)\\d{6}$/',
+ 'fixed' => '/^1(?:2\\d{1,2}|[3-5]\\d|6\\d?|[89][0-6]\\d)\\d{4}|2(?:[236-9]\\d{4}|4(?:0\\d{5}|\\d{4})|5(?:1\\d{3,6}|[02-9]\\d{3,5}))|4(?:2[245-8]|[346][2-6]|5[3-5])\\d{4}|5(?:2(?:20?|[3-8])|3[2-68]|4(?:21?|[4-8])|5[23]|6[2-4]|7[2-8]|8[24-7]|9[2-7])\\d{4}|6(?:0[23]|1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7(?:[2367]|4\\d|5\\d?|8[145]\\d)|8[245]|9[24])\\d{4}|7(?:[04][24-8]|[15][2-7]|22|3[2-4])\\d{4}|8(?:1(?:2\\d?|[3-689])|2[2-8]|3[24]|4[24-7]|5[245]|6[23])\\d{4}$/',
+ 'mobile' => '/^17[01]\\d{4}|9(?:2[0-4]|4(?:0[0-4]\\d|[1379]\\d|[24][0-589]\\d|5\\d{2}|88)|5[0-6]|61?\\d|73\\d|8\\d|9(?:1\\d|[089]))\\d{5}$/',
+ 'voip' => '/^1333\\d{4}$/',
+ 'emergency' => '/^199$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,10}$/',
+ 'fixed' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{7,10}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MN.php
new file mode 100644
index 0000000000000000000000000000000000000000..52d4294febce221a6328b086a8e8646a0169d0d0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MN.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '976',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[12]\\d{7,9}|[57-9]\\d{7}$/',
+ 'fixed' => '/^[12](?:1\\d|2(?:[1-3]\\d?|7\\d)|3[2-8]\\d{1,2}|4[2-68]\\d{1,2}|5[1-4689]\\d{1,2})\\d{5}|5[0568]\\d{6}$/',
+ 'mobile' => '/^(?:8[89]|9[013-9])\\d{6}$/',
+ 'voip' => '/^7[05-8]\\d{6}$/',
+ 'emergency' => '/^10[0-3]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MO.php
new file mode 100644
index 0000000000000000000000000000000000000000..4729ba4c16e4170bad28936e1d2a1c598080ce6d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MO.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '853',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[268]\\d{7}$/',
+ 'fixed' => '/^(?:28[2-57-9]|8[2-57-9]\\d)\\d{5}$/',
+ 'mobile' => '/^6[236]\\d{6}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MP.php
new file mode 100644
index 0000000000000000000000000000000000000000..5343caff6b7544f84eae4cff8035d1a5a3070c17
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MP.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5689]\\d{9}$/',
+ 'fixed' => '/^670(?:2(?:3[3-7]|56|8[5-8])|32[1238]|4(?:33|8[348])|5(?:32|55|88)|6(?:64|70|82)|78[589]|8[3-9]8|989)\\d{4}$/',
+ 'mobile' => '/^670(?:2(?:3[3-7]|56|8[5-8])|32[1238]|4(?:33|8[348])|5(?:32|55|88)|6(?:64|70|82)|78[589]|8[3-9]8|989)\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MQ.php
new file mode 100644
index 0000000000000000000000000000000000000000..875fe07d30e4aee3ec6192c0af621000f91c536d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MQ.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '596',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[56]\\d{8}$/',
+ 'fixed' => '/^596(?:0[2-5]|[12]0|3[05-9]|4[024-8]|[5-7]\\d|89|9[4-8])\\d{4}$/',
+ 'mobile' => '/^696(?:[0-479]\\d|5[01]|8[0-689])\\d{4}$/',
+ 'emergency' => '/^1(?:12|[578])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MR.php
new file mode 100644
index 0000000000000000000000000000000000000000..484d8d9861e8a66efb5addfba21c5af58fbb76d8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MR.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '222',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-48]\\d{7}$/',
+ 'fixed' => '/^25[08]\\d{5}|35\\d{6}|45[1-7]\\d{5}$/',
+ 'mobile' => '/^(?:2(?:2\\d|70)|3(?:3\\d|6[1-36]|7[1-3])|4(?:4\\d|6[0457-9]|7[4-9]))\\d{5}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'emergency' => '/^1[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MS.php
new file mode 100644
index 0000000000000000000000000000000000000000..1ef77f036a84cb706572673ac505a3dc57a82e7e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MS.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5689]\\d{9}$/',
+ 'fixed' => '/^664491\\d{4}$/',
+ 'mobile' => '/^66449[2-6]\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MT.php
new file mode 100644
index 0000000000000000000000000000000000000000..c648ef384b60e57631825fd5f595aa6aa8ba4e6b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MT.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '356',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2579]\\d{7}$/',
+ 'fixed' => '/^2(?:0(?:1[0-6]|[69]\\d)|[1-357]\\d{2})\\d{4}$/',
+ 'mobile' => '/^(?:7(?:210|[79]\\d{2})|9(?:2[13]\\d|696|8(?:1[1-3]|89|97)|9\\d{2}))\\d{4}$/',
+ 'pager' => '/^7117\\d{4}$/',
+ 'premium' => '/^50(?:0(?:3[1679]|4\\d)|[169]\\d{2}|7[06]\\d)\\d{3}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MU.php
new file mode 100644
index 0000000000000000000000000000000000000000..7be716a9bfe9456eaa6e473440527fb6a34e6343
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MU.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '230',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{6}$/',
+ 'fixed' => '/^(?:2(?:[034789]\\d|1[0-7]|6[1-69])|4(?:[013-8]\\d|2[4-7])|[56]\\d{2}|8(?:14|3[129]))\\d{4}$/',
+ 'mobile' => '/^(?:25\\d|4(?:2[12389]|9\\d)|7\\d{2}|8(?:20|7[15-8])|9[1-8]\\d)\\d{4}$/',
+ 'pager' => '/^2(?:1[89]|2\\d)\\d{4}$/',
+ 'tollfree' => '/^80[012]\\d{4}$/',
+ 'premium' => '/^30\\d{5}$/',
+ 'voip' => '/^3(?:20|9\\d)\\d{4}$/',
+ 'shortcode' => '/^1(?:1[0-36-9]|[02-9]\\d|\\d{3,4})|8\\d{3}$/',
+ 'emergency' => '/^11[45]|99\\d$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3,5}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MV.php
new file mode 100644
index 0000000000000000000000000000000000000000..40e0a52ef299ac36d7a878af79462cd9a0ab0a76
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MV.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '960',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3467]\\d{6}|9(?:00\\d{7}|\\d{6})$/',
+ 'fixed' => '/^(?:3(?:0[01]|3[0-59])|6(?:[567][02468]|8[024689]|90))\\d{4}$/',
+ 'mobile' => '/^(?:46[46]|7[3-9]\\d|9[6-9]\\d)\\d{4}$/',
+ 'pager' => '/^781\\d{4}$/',
+ 'premium' => '/^900\\d{7}$/',
+ 'shortcode' => '/^1(?:[19]0|23)$/',
+ 'emergency' => '/^1(?:02|19)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,10}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{7}$/',
+ 'pager' => '/^\\d{7}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MW.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa02009369bf20f0b12359e29bb79dbeb577c3bb
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MW.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '265',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:1(?:\\d{2})?|[2789]\\d{2})\\d{6}$/',
+ 'fixed' => '/^(?:1[2-9]|21\\d{2})\\d{5}$/',
+ 'mobile' => '/^(?:111|77\\d|88\\d|99\\d)\\d{6}$/',
+ 'emergency' => '/^199|99[789]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MX.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b200a251a9dec523458bdb0687472c6ae788013
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MX.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '52',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{9,10}$/',
+ 'fixed' => '/^(?:33|55|81)\\d{8}|(?:2(?:2[2-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-6][1-9]|[37][1-8]|8[1-35-9]|9[2-689])|5(?:88|9[1-79])|6(?:1[2-68]|[234][1-9]|5[1-3689]|6[12457-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2[1-8]|5[13-9]|8[1-69]|9[17])|8(?:2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7}$/',
+ 'mobile' => '/^1(?:(?:33|55|81)\\d{8}|(?:2(?:2[2-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-6][1-9]|[37][1-8]|8[1-35-9]|9[2-689])|5(?:88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[12457-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2[1-8]|5[13-9]|8[1-69]|9[17])|8(?:2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))\\d{7})$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'premium' => '/^900\\d{7}$/',
+ 'emergency' => '/^06[568]|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,11}$/',
+ 'fixed' => '/^\\d{7,10}$/',
+ 'mobile' => '/^\\d{11}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MY.php
new file mode 100644
index 0000000000000000000000000000000000000000..645e0a754d4a490d8f820ebd7ecdddf9bc3a36ef
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MY.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '60',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[13-9]\\d{7,9}$/',
+ 'fixed' => '/^(?:3[2-9]\\d|[4-9][2-9])\\d{6}$/',
+ 'mobile' => '/^1(?:1[1-3]\\d{2}|[02-4679][2-9]\\d|8(?:1[23]|[2-9]\\d))\\d{5}$/',
+ 'tollfree' => '/^1[38]00\\d{6}$/',
+ 'premium' => '/^1600\\d{6}$/',
+ 'personal' => '/^1700\\d{6}$/',
+ 'voip' => '/^154\\d{7}$/',
+ 'emergency' => '/^112|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{9,10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..33ce8ff5eb8ac3110ec0c19421ae441935fa12de
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MZ.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '258',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[28]\\d{7,8}$/',
+ 'fixed' => '/^2(?:[1346]\\d|5[0-2]|[78][12]|93)\\d{5}$/',
+ 'mobile' => '/^8[246]\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'shortcode' => '/^1[0234]\\d$/',
+ 'emergency' => '/^1(?:1[79]|9[78])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NA.php
new file mode 100644
index 0000000000000000000000000000000000000000..aca0423a45cd913102f7620614dbd2fea91c3552
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NA.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '264',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[68]\\d{7,8}$/',
+ 'fixed' => '/^6(?:1(?:17|2(?:[0189]\\d|[2-6]|7\\d?)|3(?:2\\d|3[378])|4[01]|69|7[014])|2(?:17|25|5(?:[0-36-8]|4\\d?)|69|70)|3(?:17|2(?:[0237]\\d?|[14-689])|34|6[29]|7[01]|81)|4(?:17|2(?:[012]|7?)|4(?:[06]|1\\d)|5(?:[01357]|[25]\\d?)|69|7[01])|5(?:17|2(?:[0459]|[23678]\\d?)|69|7[01])|6(?:17|2(?:5|6\\d?)|38|42|69|7[01])|7(?:17|2(?:[569]|[234]\\d?)|3(?:0\\d?|[13])|69|7[01]))\\d{4}$/',
+ 'mobile' => '/^(?:60|8[125])\\d{7}$/',
+ 'premium' => '/^8701\\d{5}$/',
+ 'voip' => '/^8(3\\d{2}|86)\\d{5}$/',
+ 'shortcode' => '/^1\\d{3}|9(?:3111|\\d{2})$/',
+ 'emergency' => '/^10111$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shortcode' => '/^\\d{3,5}$/',
+ 'emergency' => '/^\\d{5}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NC.php
new file mode 100644
index 0000000000000000000000000000000000000000..a0457ffacab55d996c51acce8ca7ffb80236ec1e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NC.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '687',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-47-9]\\d{5}$/',
+ 'fixed' => '/^(?:2[03-9]|3[0-5]|4[1-7]|88)\\d{4}$/',
+ 'mobile' => '/^(?:[79]\\d|8[0-79])\\d{4}$/',
+ 'premium' => '/^36\\d{4}$/',
+ 'shortcode' => '/^10(?:0[06]|1[02-46]|20|3[0125]|42|5[058]|77)$/',
+ 'emergency' => '/^1[5-8]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6}$/',
+ 'shortcode' => '/^\\d{4}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NE.php
new file mode 100644
index 0000000000000000000000000000000000000000..34dff2ece46678c150b4c8d8b9e4cc7d2d183fa3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NE.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '227',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[029]\\d{7}$/',
+ 'fixed' => '/^2(?:0(?:20|3[1-7]|4[134]|5[14]|6[14578]|7[1-578])|1(?:4[145]|5[14]|6[14-68]|7[169]|88))\\d{4}$/',
+ 'mobile' => '/^9[0-46-9]\\d{6}$/',
+ 'tollfree' => '/^08\\d{6}$/',
+ 'premium' => '/^09\\d{6}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NF.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae085996788e94fc7c351c513e953dfd74f5de46
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NF.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '672',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[13]\\d{5}$/',
+ 'fixed' => '/^(?:1(?:06|17|28|39)|3[012]\\d)\\d{3}$/',
+ 'mobile' => '/^38\\d{4}$/',
+ 'emergency' => '/^9(?:11|55|77)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NG.php
new file mode 100644
index 0000000000000000000000000000000000000000..70496c960f498b071129d39a59e1d0a1f956e876
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NG.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '234',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-69]\\d{5,8}|[78]\\d{5,13}$/',
+ 'fixed' => '/^[12]\\d{6,7}|9\\d{7}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}$/',
+ 'mobile' => '/^(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[3-9]\\d|2[1-9])|8(?:0[2-9]|1\\d)\\d)\\d{6}$/',
+ 'tollfree' => '/^800\\d{7,11}$/',
+ 'uan' => '/^700\\d{7,11}$/',
+ 'emergency' => '/^199$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,14}$/',
+ 'fixed' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{8,10}$/',
+ 'tollfree' => '/^\\d{10,14}$/',
+ 'uan' => '/^\\d{10,14}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NI.php
new file mode 100644
index 0000000000000000000000000000000000000000..06db4a8cd8778306074b31cbbc6e260e6402e5b6
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NI.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '505',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[128]\\d{7}$/',
+ 'fixed' => '/^2\\d{7}$/',
+ 'mobile' => '/^8\\d{7}$/',
+ 'tollfree' => '/^1800\\d{4}$/',
+ 'emergency' => '/^118$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NL.php
new file mode 100644
index 0000000000000000000000000000000000000000..bdd10016708cfe383f3fb05328c564c5a8042e80
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NL.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '31',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{4,8}|[2-7]\\d{8}|[89]\\d{6,9}$/',
+ 'fixed' => '/^(?:1[0135-8]|2[02-69]|3[0-68]|4[0135-9]|[57]\\d|8[478])\\d{7}$/',
+ 'mobile' => '/^6[1-58]\\d{7}$/',
+ 'pager' => '/^66\\d{7}$/',
+ 'tollfree' => '/^800\\d{4,7}$/',
+ 'premium' => '/^90[069]\\d{4,7}$/',
+ 'voip' => '/^85\\d{7}$/',
+ 'uan' => '/^140(?:1(?:[035]|[16-8]\\d)|2(?:[0346]|[259]\\d)|3(?:[03568]|[124]\\d)|4(?:[0356]|[17-9]\\d)|5(?:[0358]|[124679]\\d)|7\\d|8[458])$/',
+ 'shortcode' => '/^18\\d{2}$/',
+ 'emergency' => '/^112|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,10}$/',
+ 'fixed' => '/^\\d{9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'pager' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{7,10}$/',
+ 'premium' => '/^\\d{7,10}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{5,6}$/',
+ 'shortcode' => '/^\\d{4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..e875d05a98fa450d4079b3f7cebe5dec9bd6dc40
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NO.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '47',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^0\\d{4}|[2-9]\\d{7}$/',
+ 'fixed' => '/^(?:2[1-4]|3[1-3578]|5[1-35-7]|6[1-4679]|7[0-8])\\d{6}$/',
+ 'mobile' => '/^(?:4[015-8]|5[89]|9\\d)\\d{6}$/',
+ 'tollfree' => '/^80[01]\\d{5}$/',
+ 'premium' => '/^82[09]\\d{5}$/',
+ 'shared' => '/^810(?:0[0-6]|[2-8]\\d)\\d{3}$/',
+ 'personal' => '/^880\\d{5}$/',
+ 'voip' => '/^85[0-5]\\d{5}$/',
+ 'uan' => '/^0\\d{4}|81(?:0(?:0[7-9]|1\\d)|5\\d{2})\\d{3}$/',
+ 'voicemail' => '/^81[23]\\d{5}$/',
+ 'emergency' => '/^11[023]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5}(?:\\d{3})?$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'personal' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'voicemail' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NP.php
new file mode 100644
index 0000000000000000000000000000000000000000..7149188d8e7719691e1f65f76db567c2e3b6dd26
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NP.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '977',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-8]\\d{7}|9(?:[1-69]\\d{6}|7[2-6]\\d{5,7}|8\\d{8})$/',
+ 'fixed' => '/^(?:1[0124-6]|2[13-79]|3[135-8]|4[146-9]|5[135-7]|6[13-9]|7[15-9]|8[1-46-9]|9[1-79])\\d{6}$/',
+ 'mobile' => '/^9(?:7[45]|8[0145])\\d{7}$/',
+ 'emergency' => '/^1(?:0[0-3]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NR.php
new file mode 100644
index 0000000000000000000000000000000000000000..39f3f92117a560b945333e0cc894a4989f526832
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NR.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '674',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[458]\\d{6}$/',
+ 'fixed' => '/^(?:444|888)\\d{4}$/',
+ 'mobile' => '/^55[5-9]\\d{4}$/',
+ 'shortcode' => '/^1(?:23|92)$/',
+ 'emergency' => '/^11[0-2]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NU.php
new file mode 100644
index 0000000000000000000000000000000000000000..da37b2c1f26cc80e818dce0b642d17b4d46ac897
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NU.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '683',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-5]\\d{3}$/',
+ 'fixed' => '/^[34]\\d{3}$/',
+ 'mobile' => '/^[125]\\d{3}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..3631a0fcd82977b86b9f162dfd4d31da66a90bef
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NZ.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '64',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^6[235-9]\\d{6}|[2-57-9]\\d{7,10}$/',
+ 'fixed' => '/^(?:3[2-79]|[49][2-689]|6[235-9]|7[2-589])\\d{6}|24099\\d{3}$/',
+ 'mobile' => '/^2(?:[028]\\d{7,8}|1(?:0\\d{5,7}|[12]\\d{5,6}|[3-9]\\d{5})|[79]\\d{7})$/',
+ 'pager' => '/^[28]6\\d{6,7}$/',
+ 'tollfree' => '/^508\\d{6,7}|80\\d{6,8}$/',
+ 'premium' => '/^90\\d{7,9}$/',
+ 'emergency' => '/^111$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,11}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{8,10}$/',
+ 'pager' => '/^\\d{8,9}$/',
+ 'tollfree' => '/^\\d{8,10}$/',
+ 'premium' => '/^\\d{9,11}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/OM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/OM.php
new file mode 100644
index 0000000000000000000000000000000000000000..3667e8cded7eea9103db97a823ee6f19b1620245
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/OM.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '968',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:2[2-6]|5|9[1-9])\\d{6}|800\\d{5,6}$/',
+ 'fixed' => '/^2[2-6]\\d{6}$/',
+ 'mobile' => '/^9[1-9]\\d{6}$/',
+ 'tollfree' => '/^8007\\d{4,5}|500\\d{4}$/',
+ 'emergency' => '/^9999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{7,9}$/',
+ 'emergency' => '/^\\d{4}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PA.php
new file mode 100644
index 0000000000000000000000000000000000000000..36268063eafd12d129328fae52ebd4e184d56dde
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PA.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '507',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{6,7}$/',
+ 'fixed' => '/^(?:1(?:0[02-579]|19|2[37]|3[03]|4[479]|57|65|7[016-8]|8[58]|9[134])|2(?:[0235679]\\d|1[0-7]|4[04-9]|8[028])|3(?:0[0-7]|1[14-7]|2[0-3]|3[03]|4[0457]|5[56]|6[068]|7[078]|80|9\\d)|4(?:3[013-59]|4\\d|7[0-689])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-267]|[349]0|5[6-9]|7[0-24-7]|8[89])|8(?:[34]\\d|5[0-4]|8[02])|9(?:0[78]|1[0178]|2[0378]|3[379]|40|5[0489]|6[06-9]|7[046-9]|8[36-8]|9[1-9]))\\d{4}$/',
+ 'mobile' => '/^(?:1[16]1|21[89]|8(?:1[01]|7[23]))\\d{4}|6(?:[04-9]\\d|1[0-5]|2[0-7]|3[5-9])\\d{5}$/',
+ 'tollfree' => '/^80[09]\\d{4}$/',
+ 'premium' => '/^(?:779|8(?:2[235]|55|60|7[578]|86|95)|9(?:0[0-2]|81))\\d{4}$/',
+ 'shortcode' => '/^10[2-4]$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'tollfree' => '/^\\d{7}$/',
+ 'premium' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PE.php
new file mode 100644
index 0000000000000000000000000000000000000000..6baf211b27980fca63e5c75a6d657d55b6e67f94
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PE.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '51',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[14-9]\\d{7,8}$/',
+ 'fixed' => '/^(?:1\\d|4[1-4]|5[1-46]|6[1-7]|7[2-46]|8[2-4])\\d{6}$/',
+ 'mobile' => '/^9\\d{8}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^805\\d{5}$/',
+ 'shared' => '/^801\\d{5}$/',
+ 'personal' => '/^80[24]\\d{5}$/',
+ 'emergency' => '/^1(?:05|1[67])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'personal' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PF.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb76accd50a0d6e42b8cc710e291a789e34ea91b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PF.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '689',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{5}$/',
+ 'fixed' => '/^(?:4(?:[02-9]\\d|1[02-9])|[5689]\\d{2})\\d{3}$/',
+ 'mobile' => '/^(?:[27]\\d{2}|3[0-79]\\d|411)\\d{3}$/',
+ 'emergency' => '/^1[578]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PG.php
new file mode 100644
index 0000000000000000000000000000000000000000..8c8b7d01ce554a6337593bc09a70cc104c09f139
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PG.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '675',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{6,7}$/',
+ 'fixed' => '/^(?:3\\d{2}|4[257]\\d|5[34]\\d|6(?:29|4[1-9])|85[02-46-9]|9[78]\\d)\\d{4}$/',
+ 'mobile' => '/^(?:68|7[0-36]\\d)\\d{5}$/',
+ 'tollfree' => '/^180\\d{4}$/',
+ 'voip' => '/^275\\d{4}$/',
+ 'emergency' => '/^000$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{7,8}$/',
+ 'tollfree' => '/^\\d{7}$/',
+ 'voip' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PH.php
new file mode 100644
index 0000000000000000000000000000000000000000..ce66d7d6f9ab021a4f4a755d0b4ba7f4bd29980b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PH.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '63',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{7,9}|1800\\d{7,9}$/',
+ 'fixed' => '/^(?:2|3[2-68]|4[2-9]|5[2-6]|6[2-58]|7[24578]|8[2-8])\\d{7}$/',
+ 'mobile' => '/^9(?:0[5-9]|1[025-9]|2[0-36-9]|3[02-9]|4[236-9]|7[349]|89|9[49])\\d{7}$/',
+ 'tollfree' => '/^1800\\d{7,9}$/',
+ 'emergency' => '/^11[27]|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,13}$/',
+ 'fixed' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{11,13}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..cd3953bd55cfc1cf6e72a9d7727465f8e3d3bd3c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PK.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '92',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^1\\d{8}|[2-8]\\d{5,11}|9(?:[013-9]\\d{4,9}|2\\d(?:111\\d{6}|\\d{3,7}))$/',
+ 'fixed' => '/^(?:21|42)[2-9]\\d{7}|(?:2[25]|4[0146-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]\\d{6}|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:1|2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8]))[2-9]\\d{5,6}|58[126]\\d{7}$/',
+ 'mobile' => '/^3(?:0\\d|1[1-5]|2[0-5]|3[1-6]|4[1-7]|55|64)\\d{7}$/',
+ 'tollfree' => '/^800\\d{5}$/',
+ 'premium' => '/^900\\d{5}$/',
+ 'personal' => '/^122\\d{6}$/',
+ 'uan' => '/^(?:2(?:[125]|3[2358]|4[2-4]|9[2-8])|4(?:[0-246-9]|5[3479])|5(?:[1-35-7]|4[2-467])|6(?:[1-8]|0[468])|7(?:[14]|2[236])|8(?:[16]|2[2-689]|3[23578]|4[3478]|5[2356])|9(?:1|22|3[27-9]|4[2-6]|6[3569]|9[2-7]))111\\d{6}$/',
+ 'emergency' => '/^1(?:1(?:22?|5)|[56])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,12}$/',
+ 'fixed' => '/^\\d{6,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{11,12}$/',
+ 'emergency' => '/^\\d{2,4}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PL.php
new file mode 100644
index 0000000000000000000000000000000000000000..bfe378e5a07d4b718520d1924b99d3238601ab7d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PL.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '48',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-58]\\d{6,8}|9\\d{8}|[67]\\d{5,8}$/',
+ 'fixed' => '/^(?:1[2-8]|2[2-59]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-6]|8[1-7])\\d{5,7}|77\\d{4,7}|(?:89|9[145])\\d{7}$/',
+ 'mobile' => '/^(?:5[013]|6[069]|7[2389]|88)\\d{7}$/',
+ 'pager' => '/^642\\d{3,6}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^70\\d{7}$/',
+ 'shared' => '/^801\\d{6}$/',
+ 'voip' => '/^39\\d{7}$/',
+ 'emergency' => '/^112|99[789]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shared' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PM.php
new file mode 100644
index 0000000000000000000000000000000000000000..a63aaeabf600e63b74bb68e3e9dec174769fd850
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PM.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '508',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[45]\\d{5}$/',
+ 'fixed' => '/^41\\d{4}$/',
+ 'mobile' => '/^55\\d{4}$/',
+ 'emergency' => '/^1[578]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PR.php
new file mode 100644
index 0000000000000000000000000000000000000000..96906921e6d8ad386cef8eae3b1177da03189106
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PR.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5789]\\d{9}$/',
+ 'fixed' => '/^(?:787|939)[2-9]\\d{6}$/',
+ 'mobile' => '/^(?:787|939)[2-9]\\d{6}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PS.php
new file mode 100644
index 0000000000000000000000000000000000000000..bba95830c3e01f632b75a1a326de1b544a570258
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PS.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '970',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[24589]\\d{7,8}|1(?:[78]\\d{8}|[49]\\d{2,3})$/',
+ 'fixed' => '/^(?:22[234789]|42[45]|82[01458]|92[369])\\d{5}$/',
+ 'mobile' => '/^5[69]\\d{7}$/',
+ 'tollfree' => '/^1800\\d{6}$/',
+ 'premium' => '/^1(?:4|9\\d)\\d{2}$/',
+ 'shared' => '/^1700\\d{6}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4,10}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{4,5}$/',
+ 'shared' => '/^\\d{10}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PT.php
new file mode 100644
index 0000000000000000000000000000000000000000..a2c05fa6db718c7eb43b0d663cbe0e4d43bd8c1d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PT.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '351',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-46-9]\\d{8}$/',
+ 'fixed' => '/^2(?:[12]\\d|[35][1-689]|4[1-59]|6[1-35689]|7[1-9]|8[1-69]|9[1256])\\d{6}$/',
+ 'mobile' => '/^9(?:[136]\\d{2}|2[0-79]\\d|480)\\d{5}$/',
+ 'tollfree' => '/^80[02]\\d{6}$/',
+ 'premium' => '/^76(?:0[1-57]|1[2-47]|2[237])\\d{5}$/',
+ 'shared' => '/^80(?:8\\d|9[1579])\\d{5}$/',
+ 'personal' => '/^884[128]\\d{5}$/',
+ 'voip' => '/^30\\d{7}$/',
+ 'uan' => '/^70(?:7\\d|8[17])\\d{5}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PW.php
new file mode 100644
index 0000000000000000000000000000000000000000..cdbc23e07f5006272044aedde7005f1c58d9b521
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PW.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '680',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-8]\\d{6}$/',
+ 'fixed' => '/^2552255|(?:277|345|488|5(?:35|44|87)|6(?:22|54|79)|7(?:33|47)|8(?:24|55|76))\\d{4}$/',
+ 'mobile' => '/^(?:6[234689]0|77[45789])\\d{4}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PY.php
new file mode 100644
index 0000000000000000000000000000000000000000..76887ff02ee5947f9f16c2cd922f9a79563c7442
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PY.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '595',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^5[0-5]\\d{4,7}|[2-46-9]\\d{5,8}$/',
+ 'fixed' => '/^(?:[26]1|3[289]|4[124678]|7[123]|8[1236])\\d{5,7}|(?:2(?:2[4568]|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51)|4(?:18|2[45]|3[12]|5[13]|64|71|9[1-47])|5(?:[1-4]\\d|5[0234])|6(?:3[1-3]|44|7[1-4678])|7(?:17|4[0-4]|6[1-578]|75|8[0-8])|858)\\d{5,6}$/',
+ 'mobile' => '/^9(?:61|[78][1-6]|9[1-5])\\d{6}$/',
+ 'voip' => '/^8700[0-4]\\d{4}$/',
+ 'uan' => '/^[2-9]0\\d{4,7}$/',
+ 'shortcode' => '/^1[1-4]\\d$/',
+ 'emergency' => '/^128|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{6,9}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/QA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/QA.php
new file mode 100644
index 0000000000000000000000000000000000000000..684c88efde75aa1d1d761b1110ec41ed6dc23436
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/QA.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '974',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-8]\\d{6,7}$/',
+ 'fixed' => '/^4[04]\\d{6}$/',
+ 'mobile' => '/^[3567]\\d{7}$/',
+ 'pager' => '/^2(?:[12]\\d|61)\\d{4}$/',
+ 'tollfree' => '/^800\\d{4}$/',
+ 'shortcode' => '/^(?:1|20|9[27]\\d)\\d{2}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'pager' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RE.php
new file mode 100644
index 0000000000000000000000000000000000000000..600890773390222ff2f4afbaef8c000e934dde07
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RE.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '262',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[268]\\d{8}$/',
+ 'fixed' => '/^262\\d{6}$/',
+ 'mobile' => '/^6(?:9[23]|47)\\d{6}$/',
+ 'tollfree' => '/^80\\d{7}$/',
+ 'premium' => '/^89[1-37-9]\\d{6}$/',
+ 'shared' => '/^8(?:1[019]|2[0156]|84|90)\\d{6}$/',
+ 'emergency' => '/^1(?:12|[578])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RO.php
new file mode 100644
index 0000000000000000000000000000000000000000..9cabe23dbbd44f8cca337aafdbe5230f31079e25
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RO.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '40',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^2\\d{5,8}|[37-9]\\d{8}$/',
+ 'fixed' => '/^2(?:1(?:\\d{7}|9\\d{3})|[3-6](?:\\d{7}|\\d9\\d{2}))|3[13-6]\\d{7}$/',
+ 'mobile' => '/^7[1-8]\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^90[036]\\d{6}$/',
+ 'shared' => '/^801\\d{6}$/',
+ 'personal' => '/^802\\d{6}$/',
+ 'uan' => '/^37\\d{7}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shared' => '/^\\d{9}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RS.php
new file mode 100644
index 0000000000000000000000000000000000000000..72ca48b64d4a9cf4cc0cf6249bf432e604bdaf98
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RS.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '381',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[126-9]\\d{4,11}|3(?:[0-79]\\d{3,10}|8[2-9]\\d{2,9})$/',
+ 'fixed' => '/^(?:1(?:[02-9][2-9]|1[1-9])\\d|2(?:[0-24-7][2-9]\\d|[389](?:0[2-9]|[2-9]\\d))|3(?:[0-8][2-9]\\d|9(?:[2-9]\\d|0[2-9])))\\d{3,8}$/',
+ 'mobile' => '/^6(?:[0-689]|7\\d)\\d{6,7}$/',
+ 'tollfree' => '/^800\\d{3,9}$/',
+ 'premium' => '/^(?:90[0169]|78\\d)\\d{3,7}$/',
+ 'uan' => '/^7[06]\\d{4,10}$/',
+ 'shortcode' => '/^1(?:1(?:[013-9]|\\d(2,4))|[89]\\d{1,4})$/',
+ 'emergency' => '/^112|9[234]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,12}$/',
+ 'fixed' => '/^\\d{5,12}$/',
+ 'mobile' => '/^\\d{8,10}$/',
+ 'tollfree' => '/^\\d{6,12}$/',
+ 'premium' => '/^\\d{6,12}$/',
+ 'uan' => '/^\\d{6,12}$/',
+ 'shortcode' => '/^\\d{3,6}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RU.php
new file mode 100644
index 0000000000000000000000000000000000000000..21bbe1713b499105d3fecc95bede0efcda559445
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RU.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '7',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3489]\\d{9}$/',
+ 'fixed' => '/^(?:3(?:0[12]|4[1-35-79]|5[1-3]|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15]|6[1-35-7]|7[1-37-9]))\\d{7}$/',
+ 'mobile' => '/^9\\d{9}$/',
+ 'tollfree' => '/^80[04]\\d{7}$/',
+ 'premium' => '/^80[39]\\d{7}$/',
+ 'emergency' => '/^0[123]|112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RW.php
new file mode 100644
index 0000000000000000000000000000000000000000..5f988f7e967e7d10670fe5b07d30c14fdc3716c5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RW.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '250',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[027-9]\\d{7,8}$/',
+ 'fixed' => '/^2[258]\\d{7}|06\\d{6}$/',
+ 'mobile' => '/^7[238]\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^900\\d{6}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SA.php
new file mode 100644
index 0000000000000000000000000000000000000000..851fa279974d9e5965257348a6e02c47fa27aeb8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SA.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '966',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^(?:[1-467]|92)\\d{7}|5\\d{8}|8\\d{9}$/',
+ 'fixed' => '/^(?:[12][24-8]|3[35-8]|4[3-68]|6[2-5]|7[235-7])\\d{6}$/',
+ 'mobile' => '/^(?:5[013-689]\\d|8111)\\d{6}$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'uan' => '/^9200\\d{5}$/',
+ 'shortcode' => '/^9(0[24-79]|33|40|66|8[59]|9[02-6])$/',
+ 'emergency' => '/^99[7-9]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,10}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{9,10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{9}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SB.php
new file mode 100644
index 0000000000000000000000000000000000000000..29269739873f8091b1cab550ef444ddee6b38fdd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SB.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '677',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{4,6}$/',
+ 'fixed' => '/^(?:1[4-79]|[23]\\d|4[01]|5[03]|6[0-37])\\d{3}$/',
+ 'mobile' => '/^48\\d{3}|7(?:[46-8]\\d|5[025-9]|90)\\d{4}|8[4-8]\\d{5}|9(?:[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8])\\d{4}$/',
+ 'tollfree' => '/^1[38]\\d{3}$/',
+ 'voip' => '/^5[12]\\d{3}$/',
+ 'shortcode' => '/^1(?:0[02-79]|1[12]|2[0-26]|4[189]|68)|9(?:[01]1|22|33|55|77|88)$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,7}$/',
+ 'fixed' => '/^\\d{5}$/',
+ 'tollfree' => '/^\\d{5}$/',
+ 'voip' => '/^\\d{5}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SC.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb635726e6c98122388fbc0d24782ea48382177a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SC.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '248',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[24689]\\d{5,6}$/',
+ 'fixed' => '/^4[2-46]\\d{5}$/',
+ 'mobile' => '/^2[5-8]\\d{5}$/',
+ 'tollfree' => '/^8000\\d{2}$/',
+ 'premium' => '/^98\\d{4}$/',
+ 'voip' => '/^64\\d{5}$/',
+ 'shortcode' => '/^1(?:0\\d|1[027]|2[0-8]|3[13]|4[0-2]|[59][15]|6[1-9]|7[124-6]|8[158])|96\\d{2}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,7}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{7}$/',
+ 'tollfree' => '/^\\d{6}$/',
+ 'premium' => '/^\\d{6}$/',
+ 'voip' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SD.php
new file mode 100644
index 0000000000000000000000000000000000000000..e0946de2523af75ea10255e1d10b7a9c9640445e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SD.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '249',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[19]\\d{8}$/',
+ 'fixed' => '/^1(?:[125]\\d|8[3567])\\d{6}$/',
+ 'mobile' => '/^9[012569]\\d{7}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SE.php
new file mode 100644
index 0000000000000000000000000000000000000000..c38a5000256e486c28206eb7b390bff6173f3077
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SE.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '46',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-9]\\d{6,9}$/',
+ 'fixed' => '/^1(?:0[1-8]\\d{6}|[136]\\d{5,7}|(?:2[0-35]|4[0-4]|5[0-25-9]|7[13-6]|[89]\\d)\\d{5,6})|2(?:[136]\\d{5,7}|(?:2[0-7]|4[0136-8]|5[0138]|7[018]|8[01]|9[0-57])\\d{5,6})|3(?:[356]\\d{5,7}|(?:0[0-4]|1\\d|2[0-25]|4[056]|7[0-2]|8[0-3]|9[023])\\d{5,6})|4(?:[0246]\\d{5,7}|(?:1[0-8]|3[0135]|5[14-79]|7[0-246-9]|8[0156]|9[0-689])\\d{5,6})|5(?:0[0-6]|[15][0-5]|2[0-68]|3[0-4]|4\\d|6[03-5]|7[013]|8[0-79]|9[01])\\d{5,6}|6(?:[03]\\d{5,7}|(?:1[1-3]|2[0-4]|4[02-57]|5[0-37]|6[0-3]|7[0-2]|8[0247]|9[0-356])\\d{5,6})|8\\d{6,8}|9(?:0\\d{5,7}|(?:1[0-68]|2\\d|3[02-59]|[45][0-4]|[68][01]|7[0135-8])\\d{5,6})$/',
+ 'mobile' => '/^7[0236]\\d{7}$/',
+ 'pager' => '/^74\\d{7}$/',
+ 'tollfree' => '/^20\\d{4,7}$/',
+ 'premium' => '/^9(?:00|39|44)\\d{7}$/',
+ 'shared' => '/^77\\d{7}$/',
+ 'personal' => '/^75\\d{7}$/',
+ 'emergency' => '/^112|90000$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,10}$/',
+ 'fixed' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'pager' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{6,9}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'shared' => '/^\\d{9}$/',
+ 'personal' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3,5}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SG.php
new file mode 100644
index 0000000000000000000000000000000000000000..70c1b85b9d22aa98c56ddd9868f5f9dca303a1f2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SG.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '65',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[36]\\d{7}|[17-9]\\d{7,10}$/',
+ 'fixed' => '/^6[1-9]\\d{6}$/',
+ 'mobile' => '/^(?:8[1-7]|9[0-8])\\d{6}$/',
+ 'tollfree' => '/^1?800\\d{7}$/',
+ 'premium' => '/^1900\\d{7}$/',
+ 'voip' => '/^3[12]\\d{6}$/',
+ 'uan' => '/^7000\\d{7}$/',
+ 'shortcode' => '/^1(?:[0136]\\d{2}|[89](?:[1-9]\\d|0[1-9])|[57]\\d{2,3})|99[0246-8]$/',
+ 'emergency' => '/^99[359]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,11}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{10,11}$/',
+ 'premium' => '/^\\d{11}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'uan' => '/^\\d{11}$/',
+ 'shortcode' => '/^\\d{3,5}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SH.php
new file mode 100644
index 0000000000000000000000000000000000000000..2303d4b1a93ec3363a961020496034ae823e6765
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SH.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '290',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{3}$/',
+ 'fixed' => '/^(?:[2-468]\\d|7[01])\\d{2}$/',
+ 'premium' => '/^(?:[59]\\d|7[2-9])\\d{2}$/',
+ 'shortcode' => '/^1\\d{2,3}$/',
+ 'emergency' => '/^9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SI.php
new file mode 100644
index 0000000000000000000000000000000000000000..fdcd5540b25494326585b3e65eb920deafb77dc5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SI.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '386',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-7]\\d{6,7}|[89]\\d{4,7}$/',
+ 'fixed' => '/^(?:1\\d|[25][2-8]|3[4-8]|4[24-8]|7[3-8])\\d{6}$/',
+ 'mobile' => '/^(?:[37][01]|4[019]|51|6[48])\\d{6}$/',
+ 'tollfree' => '/^80\\d{4,6}$/',
+ 'premium' => '/^90\\d{4,6}|89[1-3]\\d{2,5}$/',
+ 'voip' => '/^(?:59|8[1-3])\\d{6}$/',
+ 'emergency' => '/^11[23]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,8}$/',
+ 'fixed' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{6,8}$/',
+ 'premium' => '/^\\d{5,8}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SJ.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a4b4261e18a9f4c3cfd0f027d2e18a706d7b158
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SJ.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '47',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^0\\d{4}|[4789]\\d{7}$/',
+ 'fixed' => '/^79\\d{6}$/',
+ 'mobile' => '/^(?:4[015-8]|5[89]|9\\d)\\d{6}$/',
+ 'tollfree' => '/^80[01]\\d{5}$/',
+ 'premium' => '/^82[09]\\d{5}$/',
+ 'shared' => '/^810(?:0[0-6]|[2-8]\\d)\\d{3}$/',
+ 'personal' => '/^880\\d{5}$/',
+ 'voip' => '/^85[0-5]\\d{5}$/',
+ 'uan' => '/^0\\d{4}|81(?:0(?:0[7-9]|1\\d)|5\\d{2})\\d{3}$/',
+ 'voicemail' => '/^81[23]\\d{5}$/',
+ 'emergency' => '/^11[023]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5}(?:\\d{3})?$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'shared' => '/^\\d{8}$/',
+ 'personal' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'voicemail' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SK.php
new file mode 100644
index 0000000000000000000000000000000000000000..1bc006ce63f6e45c5ca455e0f7ccbe85885266fb
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SK.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '421',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-689]\\d{8}$/',
+ 'fixed' => '/^[2-5]\\d{8}$/',
+ 'mobile' => '/^9(?:0[1-8]|1[0-24-9]|4[0489])\\d{6}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^9(?:[78]\\d{7}|00\\d{6})$/',
+ 'shared' => '/^8[5-9]\\d{7}$/',
+ 'voip' => '/^6(?:5[0-4]|9[0-6])\\d{6}$/',
+ 'uan' => '/^96\\d{7}$/',
+ 'emergency' => '/^1(?:12|5[058])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SL.php
new file mode 100644
index 0000000000000000000000000000000000000000..369ddac995d31a3c56ccdcd83d78b0576bdc5d50
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SL.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '232',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-578]\\d{7}$/',
+ 'fixed' => '/^[235]2[2-4][2-9]\\d{4}$/',
+ 'mobile' => '/^(?:2[15]|3[034]|4[04]|5[05]|7[6-9]|88)\\d{6}$/',
+ 'emergency' => '/^(?:01|99)9$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SM.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a44a120ea2b710ff2ce30b53f1d1ad7e6b09fe0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SM.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '378',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[05-7]\\d{7,9}$/',
+ 'fixed' => '/^0549(?:8[0157-9]|9\\d)\\d{4}$/',
+ 'mobile' => '/^6[16]\\d{6}$/',
+ 'premium' => '/^7[178]\\d{6}$/',
+ 'voip' => '/^5[158]\\d{6}$/',
+ 'emergency' => '/^11[358]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,10}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'premium' => '/^\\d{8}$/',
+ 'voip' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SN.php
new file mode 100644
index 0000000000000000000000000000000000000000..21d81d19313118ada188b7514217cde7a2777c12
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SN.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '221',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[37]\\d{8}$/',
+ 'fixed' => '/^3(?:0(?:1[01]|80)|3(?:8[1-9]|9[2-9]))\\d{5}$/',
+ 'mobile' => '/^7(?:0(?:[01279]0|3[03]|4[05]|5[06]|6[03-5]|8[029])|6(?:1[23]|2[89]|3[3489]|4[6-9]|5\\d|6[3-9]|7[45]|8[3-8])|7\\d{2}|8(?:01|1[01]))\\d{5}$/',
+ 'voip' => '/^33301\\d{4}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SO.php
new file mode 100644
index 0000000000000000000000000000000000000000..504ea11adc67cbb6cee900176ca00d3d771a7585
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SO.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '252',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-79]\\d{6,8}$/',
+ 'fixed' => '/^(?:[134]\\d|2[0-79]|5[57-9])\\d{5}$/',
+ 'mobile' => '/^(?:15\\d|2(?:4\\d|8)|6[17-9]?\\d{2}|7\\d{2}|9[01]\\d)\\d{5}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{7}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SR.php
new file mode 100644
index 0000000000000000000000000000000000000000..56f3c0d7937bf39e2e5541524ac3cb5bee3a109e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SR.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '597',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-8]\\d{5,6}$/',
+ 'fixed' => '/^(?:2[1-3]|3[0-7]|4\\d|5[2-58]|68\\d)\\d{4}$/',
+ 'mobile' => '/^(?:7[1-57]|8[1-9])\\d{5}$/',
+ 'voip' => '/^56\\d{4}$/',
+ 'shortcode' => '/^1(?:[02-9]\\d|1[0-46-9]|\\d{3})$/',
+ 'emergency' => '/^115$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,7}$/',
+ 'mobile' => '/^\\d{7}$/',
+ 'voip' => '/^\\d{6}$/',
+ 'shortcode' => '/^\\d{3,4}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SS.php
new file mode 100644
index 0000000000000000000000000000000000000000..8215a0ce9f0d382c39532c53431a7fa121101c13
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SS.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '211',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[19]\\d{8}$/',
+ 'fixed' => '/^18\\d{7}$/',
+ 'mobile' => '/^(?:12|9[1257])\\d{7}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ST.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ST.php
new file mode 100644
index 0000000000000000000000000000000000000000..476a06b9368827c1e5588967ad33a9f582058834
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ST.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '239',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[29]\\d{6}$/',
+ 'fixed' => '/^22\\d{5}$/',
+ 'mobile' => '/^9[89]\\d{5}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SV.php
new file mode 100644
index 0000000000000000000000000000000000000000..eebc6104f547ecf6e25c3db75c8df76eee614fca
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SV.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '503',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[267]\\d{7}|[89]\\d{6}(?:\\d{4})?$/',
+ 'fixed' => '/^2[1-6]\\d{6}$/',
+ 'mobile' => '/^[67]\\d{7}$/',
+ 'tollfree' => '/^800\\d{4}(?:\\d{4})?$/',
+ 'premium' => '/^900\\d{4}(?:\\d{4})?$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}|\\d{11}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{7}(?:\\d{4})?$/',
+ 'premium' => '/^\\d{7}(?:\\d{4})?$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SX.php
new file mode 100644
index 0000000000000000000000000000000000000000..f29e6885a5031be5f09c717153ee6995bdc655e9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SX.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5789]\\d{9}$/',
+ 'fixed' => '/^7215(?:4[2-8]|8[239]|9[056])\\d{4}$/',
+ 'mobile' => '/^7215(?:1[02]|2\\d|5[034679]|8[014-8])\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^919$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SY.php
new file mode 100644
index 0000000000000000000000000000000000000000..67777eb599bafac625535b530c3ea7863cae135b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SY.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '963',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-59]\\d{7,8}$/',
+ 'fixed' => '/^(?:1(?:1\\d?|4\\d|[2356])|2[1-35]|3(?:[13]\\d|4)|4[13]|5[1-3])\\d{6}$/',
+ 'mobile' => '/^9(?:22|[35][0-8]|4\\d|6[024-9]|88|9[0-489])\\d{6}$/',
+ 'emergency' => '/^11[023]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d5e0ee57be55411a692615f21949c61d8c8555e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SZ.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '268',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[027]\\d{7}$/',
+ 'fixed' => '/^2(?:2(?:0[07]|[13]7|2[57])|3(?:0[34]|[1278]3|3[23]|[46][34])|(?:40[4-69]|67)|5(?:0[5-7]|1[6-9]|[23][78]|48|5[01]))\\d{4}$/',
+ 'mobile' => '/^7[6-8]\\d{6}$/',
+ 'tollfree' => '/^0800\\d{4}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TC.php
new file mode 100644
index 0000000000000000000000000000000000000000..891cfc2c4f5a4dcf929da2c6d223d5d2208af9e3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TC.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5689]\\d{9}$/',
+ 'fixed' => '/^649(?:712|9(?:4\\d|50))\\d{4}$/',
+ 'mobile' => '/^649(?:2(?:3[129]|4[1-7])|3(?:3[1-39]|4[1-7])|4[34][12])\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'voip' => '/^64971[01]\\d{4}$/',
+ 'emergency' => '/^9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TD.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c167c39f16c7777412c62dfeb0d8d62827e369f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TD.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '235',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2679]\\d{7}$/',
+ 'fixed' => '/^22(?:[3789]0|5[0-5]|6[89])\\d{4}$/',
+ 'mobile' => '/^(?:6[36]\\d|77\\d|9(?:5[0-4]|9\\d))\\d{5}$/',
+ 'emergency' => '/^1[78]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TG.php
new file mode 100644
index 0000000000000000000000000000000000000000..37535fa549ccb2c1db54f66951680517d7ee98f8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TG.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '228',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[29]\\d{7}$/',
+ 'fixed' => '/^2(?:2[2-7]|3[23]|44|55|66|77)\\d{5}$/',
+ 'mobile' => '/^9[0-289]\\d{6}$/',
+ 'emergency' => '/^1(?:01|1[78]|7[17])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TH.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b0348aaa416232f6f6f6ed520f669dd4681d7f0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TH.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '66',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{7,8}|1\\d{3}(?:\\d{6})?$/',
+ 'fixed' => '/^(?:2[1-9]|3[2-9]|4[2-5]|5[2-6]|7[3-7])\\d{6}$/',
+ 'mobile' => '/^[89]\\d{8}$/',
+ 'tollfree' => '/^1800\\d{6}$/',
+ 'premium' => '/^1900\\d{6}$/',
+ 'voip' => '/^60\\d{7}$/',
+ 'uan' => '/^1\\d{3}$/',
+ 'emergency' => '/^1(?:669|9[19])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4}|\\d{8,10}$/',
+ 'fixed' => '/^\\d{8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{4}$/',
+ 'emergency' => '/^\\d{3,4}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TJ.php
new file mode 100644
index 0000000000000000000000000000000000000000..3fa440fd77212861114bc4e5d5eceb33d8de7bc7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TJ.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '992',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3-59]\\d{8}$/',
+ 'fixed' => '/^(?:3(?:1[3-5]|2[245]|3[12]|4[24-7]|5[25]|72)|4(?:46|74|87))\\d{6}$/',
+ 'mobile' => '/^(?:505|9[0-35-9]\\d)\\d{6}$/',
+ 'emergency' => '/^1(?:0[1-3]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{3,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TK.php
new file mode 100644
index 0000000000000000000000000000000000000000..d498d6ea80c58bbbd61e7bb00ec601c2752a49c7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TK.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '690',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-5]\\d{3}$/',
+ 'fixed' => '/^[2-4]\\d{3}$/',
+ 'mobile' => '/^5\\d{3}$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{4}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TL.php
new file mode 100644
index 0000000000000000000000000000000000000000..8cd880a4273a00a04654ed1e77ce77d274943b56
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TL.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '670',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-489]\\d{6}|7\\d{6,7}$/',
+ 'fixed' => '/^(?:2[1-5]|3[1-9]|4[1-4])\\d{5}$/',
+ 'mobile' => '/^7[78]\\d{6}$/',
+ 'tollfree' => '/^80\\d{5}$/',
+ 'premium' => '/^90\\d{5}$/',
+ 'personal' => '/^70\\d{5}$/',
+ 'shortcode' => '/^1(?:0[02]|2[0138]|72|9[07])$/',
+ 'emergency' => '/^11[25]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'fixed' => '/^\\d{7}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{7}$/',
+ 'premium' => '/^\\d{7}$/',
+ 'personal' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TM.php
new file mode 100644
index 0000000000000000000000000000000000000000..b9ff152ab7c11a2901530e9e79daa052a2bc2359
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TM.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '993',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-6]\\d{7}$/',
+ 'fixed' => '/^(?:1(?:2\\d|3[1-9])|2(?:22|4[0-35-8])|3(?:22|4[03-9])|4(?:22|3[128]|4\\d|6[15])|5(?:22|5[7-9]|6[014-689]))\\d{5}$/',
+ 'mobile' => '/^6[3-8]\\d{6}$/',
+ 'emergency' => '/^0[1-3]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TN.php
new file mode 100644
index 0000000000000000000000000000000000000000..ed96ba0f27e5d456f6983c01f635b6c5ca0cad56
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TN.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '216',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-57-9]\\d{7}$/',
+ 'fixed' => '/^(?:3[012]|7\\d)\\d{6}$/',
+ 'mobile' => '/^(?:[259]\\d|4[0-2])\\d{6}$/',
+ 'premium' => '/^8[0128]\\d{6}$/',
+ 'emergency' => '/^19[078]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TO.php
new file mode 100644
index 0000000000000000000000000000000000000000..9dbd4e4c4f00264c5ecb29d4e12ebf051a86843d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TO.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '676',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[02-8]\\d{4,6}$/',
+ 'fixed' => '/^(?:2\\d|3[1-8]|4[1-4]|[56]0|7[0149]|8[05])\\d{3}$/',
+ 'mobile' => '/^(?:7[578]|8[7-9])\\d{5}$/',
+ 'tollfree' => '/^0800\\d{3}$/',
+ 'emergency' => '/^9(?:11|22|33|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,7}$/',
+ 'fixed' => '/^\\d{5}$/',
+ 'mobile' => '/^\\d{7}$/',
+ 'tollfree' => '/^\\d{7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TR.php
new file mode 100644
index 0000000000000000000000000000000000000000..12c1306fffb8b374c871e8d6248f8f376cdc7fca
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TR.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '90',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-589]\\d{9}|444\\d{4}$/',
+ 'fixed' => '/^(?:2(?:[13][26]|[28][2468]|[45][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\\d{7}$/',
+ 'mobile' => '/^5(?:0[1-7]|22|[34]\\d|5[1-59]|9[246])\\d{7}$/',
+ 'pager' => '/^512\\d{7}$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'premium' => '/^900\\d{7}$/',
+ 'uan' => '/^444\\d{4}|850\\d{7}$/',
+ 'emergency' => '/^1(?:1[02]|55)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,10}$/',
+ 'fixed' => '/^\\d{10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'pager' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'uan' => '/^\\d{7,10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TT.php
new file mode 100644
index 0000000000000000000000000000000000000000..748e0754b495998d6f94c459dab63ced77b127dc
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TT.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[589]\\d{9}$/',
+ 'fixed' => '/^868(?:2(?:01|2[1-5])|6(?:07|1[4-6]|2[1-9]|[3-6]\\d|7[0-79]|9[0-8])|82[12])\\d{4}$/',
+ 'mobile' => '/^868(?:29\\d|3(?:0[1-9]|1[02-9]|[2-9]\\d)|4(?:[679]\\d|8[0-4])|6(?:20|78|8\\d)|7(?:03|1[02-9]|[2-9]\\d))\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^99[09]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TV.php
new file mode 100644
index 0000000000000000000000000000000000000000..5fac559030cee03cc45ddbd960a090bbac49b03c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TV.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '688',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[29]\\d{4,5}$/',
+ 'fixed' => '/^2[02-9]\\d{3}$/',
+ 'mobile' => '/^90\\d{4}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,6}$/',
+ 'fixed' => '/^\\d{5}$/',
+ 'mobile' => '/^\\d{6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TW.php
new file mode 100644
index 0000000000000000000000000000000000000000..4407c069ae43d60982c0e04becd25b0173f05948
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TW.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '886',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{7,8}$/',
+ 'fixed' => '/^[2-8]\\d{7,8}$/',
+ 'mobile' => '/^9\\d{8}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^900\\d{6}$/',
+ 'emergency' => '/^11[029]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{8,9}$/',
+ 'fixed' => '/^\\d{8,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..c86ebe6320382941c0f2b4695a7700bc94b4f9e8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TZ.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '255',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^\\d{9}$/',
+ 'fixed' => '/^2[2-8]\\d{7}$/',
+ 'mobile' => '/^(?:6[158]|7[1-9])\\d{7}$/',
+ 'tollfree' => '/^80[08]\\d{6}$/',
+ 'premium' => '/^90\\d{7}$/',
+ 'shared' => '/^8(?:40|6[01])\\d{6}$/',
+ 'voip' => '/^41\\d{7}$/',
+ 'emergency' => '/^11[12]|999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'fixed' => '/^\\d{7,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shared' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UA.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9ed3c7f2eaf5957dc7036e8bd430904d32de4fd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UA.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '380',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3-689]\\d{8}$/',
+ 'fixed' => '/^(?:3[1-8]|4[13-8]|5[1-7]|6[12459])\\d{7}$/',
+ 'mobile' => '/^(?:39|50|6[36-8]|9[1-9])\\d{7}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'premium' => '/^900\\d{6}$/',
+ 'emergency' => '/^1(?:0[123]|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UG.php
new file mode 100644
index 0000000000000000000000000000000000000000..985f114e06f67006c8ddf4c7acc1652632306517
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UG.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '256',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^\\d{9}$/',
+ 'fixed' => '/^20(?:[014]\\d{2}|2(?:40|[5-9]\\d)|3[23]\\d|5[0-4]\\d)\\d{4}|[34]\\d{8}$/',
+ 'mobile' => '/^7(?:0[0-7]|[15789]\\d|20|[46][0-4])\\d{6}$/',
+ 'tollfree' => '/^800[123]\\d{5}$/',
+ 'premium' => '/^90[123]\\d{6}$/',
+ 'emergency' => '/^999$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,9}$/',
+ 'fixed' => '/^\\d{5,9}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/US.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/US.php
new file mode 100644
index 0000000000000000000000000000000000000000..eefdb7d0684c6716b1e07fba8efa96ddf165b78e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/US.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-9]\\d{9}$/',
+ 'fixed' => '/^(?:2(?:0[1-35-9]|1[02-9]|2[4589]|3[149]|4[08]|5[1-46]|6[0279]|7[06]|8[13])|3(?:0[1-57-9]|1[02-9]|2[0135]|3[014679]|47|5[12]|6[01]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[0235]|58|69|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-37]|7[013-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[036]|3[016]|4[16]|5[017]|6[0-279]|78|8[12])|7(?:0[1-46-8]|1[02-9]|2[047]|3[124]|4[07]|5[47]|6[02359]|7[02-59]|8[156])|8(?:0[1-68]|1[02-8]|28|3[0-25]|4[3578]|5[06-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[1678]|4[0179]|5[1246]|7[0-3589]|8[0459]))[2-9]\\d{6}$/',
+ 'mobile' => '/^(?:2(?:0[1-35-9]|1[02-9]|2[4589]|3[149]|4[08]|5[1-46]|6[0279]|7[06]|8[13])|3(?:0[1-57-9]|1[02-9]|2[0135]|3[014679]|47|5[12]|6[01]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[0235]|58|69|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-37]|7[013-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[036]|3[016]|4[16]|5[017]|6[0-279]|78|8[12])|7(?:0[1-46-8]|1[02-9]|2[047]|3[124]|4[07]|5[47]|6[02359]|7[02-59]|8[156])|8(?:0[1-68]|1[02-8]|28|3[0-25]|4[3578]|5[06-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[1678]|4[0179]|5[1246]|7[0-3589]|8[0459]))[2-9]\\d{6}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^112|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UY.php
new file mode 100644
index 0000000000000000000000000000000000000000..24f21eb2942907e6fe58fa17c7e8f01bea83af4b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UY.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '598',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2489]\\d{6,7}$/',
+ 'fixed' => '/^2\\d{7}|4[2-7]\\d{6}$/',
+ 'mobile' => '/^9[13-9]\\d{6}$/',
+ 'tollfree' => '/^80[05]\\d{4}$/',
+ 'premium' => '/^90[0-8]\\d{4}$/',
+ 'shortcode' => '/^1(?:0[4-9]|1[2368]|2[0-3568])$/',
+ 'emergency' => '/^128|911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,8}$/',
+ 'mobile' => '/^\\d{8}$/',
+ 'tollfree' => '/^\\d{7}$/',
+ 'premium' => '/^\\d{7}$/',
+ 'shortcode' => '/^\\d{3}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UZ.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e4af3acd89f1e35c67ba4412734382a1a29dc9e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UZ.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '998',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[679]\\d{8}$/',
+ 'fixed' => '/^(?:6(?:1(?:22|3[124]|4[1-4]|5[123578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d{2}|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[12456]|9[135-8])|1[12]\\d|2(?:22|3[1345789]|4[123579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|6(?:22|3[12457]|4[13-8])|9(?:22|5[1-9])))\\d{5}$/',
+ 'mobile' => '/^6(?:1(?:2(?:98|2[01])|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:11\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4])|7\\d{2})|5(?:19[01]|2(?:27|9[26])|30\\d|59\\d|7\\d{2})|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|3[79]\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79])|9[0-3]\\d)|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(2(?:1[1267]|5\\d|3[01]|7[0-4])|5[67]\\d|6(?:2[0-26]|8\\d)|7\\d{2}))\\d{4}|7(?:0\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|33\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078])|9[4-6]\\d)|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0127]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|6(?:2(?:2[1245]|4[2-4])|39\\d|41[179]|5(?:[349]\\d|5[0-2])|7(?:0[017]|[13]\\d|22|44|55|67|88))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[05629]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07])))\\d{4}|9[0-57-9]\\d{7}$/',
+ 'emergency' => '/^0(?:0[123]|[123]|50)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VA.php
new file mode 100644
index 0000000000000000000000000000000000000000..cdee15a49966c8353aa467575c55e49addb7cdf8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VA.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '379',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^06\\d{8}$/',
+ 'fixed' => '/^06698\\d{5}$/',
+ 'mobile' => '/^N/A$/',
+ 'emergency' => '/^11[2358]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{10}$/',
+ 'mobile' => '/^N/A$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VC.php
new file mode 100644
index 0000000000000000000000000000000000000000..af8efd1700562082f0fbab86c841510df4a029c4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VC.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5789]\\d{9}$/',
+ 'fixed' => '/^784(?:266|3(?:6[6-9]|7\\d|8[0-24-6])|4(?:38|5[0-36-8]|8\\d|9[01])|555|638|784)\\d{4}$/',
+ 'mobile' => '/^784(?:4(?:3[0-4]|5[45]|9[2-5])|5(?:2[6-9]|3[0-4]|93))\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VE.php
new file mode 100644
index 0000000000000000000000000000000000000000..3102321d1d4f482dd362c9d9dd9f90c7228965e9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VE.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '58',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[24589]\\d{9}$/',
+ 'fixed' => '/^(?:2(?:12|3[457-9]|[58][1-9]|[467]\\d|9[1-6])|50[01])\\d{7}$/',
+ 'mobile' => '/^4(?:1[24-8]|2[46])\\d{7}$/',
+ 'tollfree' => '/^800\\d{7}$/',
+ 'premium' => '/^900\\d{7}$/',
+ 'emergency' => '/^171$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,10}$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VG.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2816b9c8a472f940aba8844858d7577918dbd1d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VG.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2589]\\d{9}$/',
+ 'fixed' => '/^284(?:(?:229|4(?:22|9[45])|774|8(?:52|6[459]))\\d{4}|496[0-5]\\d{3})$/',
+ 'mobile' => '/^284(?:(?:3(?:0[0-3]|4[0-367])|4(?:4[0-6]|68|99)|54[0-57])\\d{4}|496[6-9]\\d{3})$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^9(?:11|99)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'mobile' => '/^\\d{10}$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VI.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f492706332ac75af0b2a3fc1cb2975826e44794
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VI.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '1',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[3589]\\d{9}$/',
+ 'fixed' => '/^340(?:2(?:01|2[067]|36|44|77)|3(?:32|44)|4(?:4[38]|7[34])|5(?:1[34]|55)|6(?:26|4[23]|9[023])|7(?:[17]\\d|27)|884|998)\\d{4}$/',
+ 'mobile' => '/^340(?:2(?:01|2[067]|36|44|77)|3(?:32|44)|4(?:4[38]|7[34])|5(?:1[34]|55)|6(?:26|4[23]|9[023])|7(?:[17]\\d|27)|884|998)\\d{4}$/',
+ 'tollfree' => '/^8(?:00|55|66|77|88)[2-9]\\d{6}$/',
+ 'premium' => '/^900[2-9]\\d{6}$/',
+ 'personal' => '/^5(?:00|33|44)[2-9]\\d{6}$/',
+ 'emergency' => '/^911$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7}(?:\\d{3})?$/',
+ 'tollfree' => '/^\\d{10}$/',
+ 'premium' => '/^\\d{10}$/',
+ 'personal' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VN.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b3ae7fa5baf50751792304c369fbda28d896977
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VN.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '84',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[17]\\d{6,9}|[2-69]\\d{7,9}|8\\d{6,8}$/',
+ 'fixed' => '/^(?:2(?:[025-79]|1[0189]|[348][01])|3(?:[0136-9]|[25][01])|4\\d|5(?:[01][01]|[2-9])|6(?:[0-46-8]|5[01])|7(?:[02-79]|[18][01])|8[1-9])\\d{7}$/',
+ 'mobile' => '/^(?:9\\d|1(?:2\\d|6[2-9]|8[68]|99))\\d{7}$/',
+ 'tollfree' => '/^1800\\d{4,6}$/',
+ 'premium' => '/^1900\\d{4,6}$/',
+ 'uan' => '/^[17]99\\d{4}|69\\d{5,6}|80\\d{5}$/',
+ 'emergency' => '/^11[345]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{7,10}$/',
+ 'fixed' => '/^\\d{9,10}$/',
+ 'mobile' => '/^\\d{9,10}$/',
+ 'tollfree' => '/^\\d{8,10}$/',
+ 'premium' => '/^\\d{8,10}$/',
+ 'uan' => '/^\\d{7,8}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VU.php
new file mode 100644
index 0000000000000000000000000000000000000000..0970f51c1ad5e723c8bf96680621ae05edd27dd5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VU.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '678',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-57-9]\\d{4,6}$/',
+ 'fixed' => '/^(?:2[2-9]\\d|3(?:[5-7]\\d|8[0-8])|48[4-9]|88\\d)\\d{2}$/',
+ 'mobile' => '/^(?:5(?:7[2-5]|[3-69]\\d)|7[013-7]\\d)\\d{4}$/',
+ 'uan' => '/^3[03]\\d{3}|900\\d{4}$/',
+ 'emergency' => '/^112$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,7}$/',
+ 'fixed' => '/^\\d{5}$/',
+ 'mobile' => '/^\\d{7}$/',
+ 'uan' => '/^\\d{5,7}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WF.php
new file mode 100644
index 0000000000000000000000000000000000000000..e9d09ed194b825841de2aeb4758fdb83a88c879f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WF.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '681',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[5-7]\\d{5}$/',
+ 'fixed' => '/^(?:50|68|72)\\d{4}$/',
+ 'mobile' => '/^(?:50|68|72)\\d{4}$/',
+ 'emergency' => '/^1[578]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6}$/',
+ 'emergency' => '/^\\d{2}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WS.php
new file mode 100644
index 0000000000000000000000000000000000000000..f7d6aff5f61dc9171dbb4847d5c9cac8afd1e8fd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WS.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '685',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[2-8]\\d{4,6}$/',
+ 'fixed' => '/^(?:[2-5]\\d|6[1-9]|84\\d{2})\\d{3}$/',
+ 'mobile' => '/^(?:60|7[25-7]\\d)\\d{4}$/',
+ 'tollfree' => '/^800\\d{3}$/',
+ 'emergency' => '/^99[4-6]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,7}$/',
+ 'fixed' => '/^\\d{5,7}$/',
+ 'mobile' => '/^\\d{6,7}$/',
+ 'tollfree' => '/^\\d{6}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YE.php
new file mode 100644
index 0000000000000000000000000000000000000000..09e137d38f45811ebe60c54f791733b259ecd03a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YE.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '967',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-7]\\d{6,8}$/',
+ 'fixed' => '/^(?:1(?:7\\d|[2-68])|2[2-68]|3[2358]|4[2-58]|5[2-6]|6[3-58]|7[24-68])\\d{5}$/',
+ 'mobile' => '/^7[0137]\\d{7}$/',
+ 'emergency' => '/^19[1459]$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{6,9}$/',
+ 'fixed' => '/^\\d{6,8}$/',
+ 'mobile' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YT.php
new file mode 100644
index 0000000000000000000000000000000000000000..3796a506b2862c9c7b438625e2512bbab003487b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YT.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '262',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[268]\\d{8}$/',
+ 'fixed' => '/^2696[0-4]\\d{4}$/',
+ 'mobile' => '/^639\\d{6}$/',
+ 'tollfree' => '/^80\\d{7}$/',
+ 'emergency' => '/^1(?:12|5)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{2,3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZA.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ef1c7acef895dab4a4d0977ffdd6bca126de420
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZA.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '27',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[1-79]\\d{8}|8(?:[067]\\d{7}|[1-4]\\d{3,7})$/',
+ 'fixed' => '/^(?:1[0-8]|2[0-378]|3[1-69]|4\\d|5[1346-8])\\d{7}$/',
+ 'mobile' => '/^(?:6[0-5]|7[0-46-9])\\d{7}|8[1-4]\\d{3,7}$/',
+ 'tollfree' => '/^80\\d{7}$/',
+ 'premium' => '/^86[2-9]\\d{6}|90\\d{7}$/',
+ 'shared' => '/^860\\d{6}$/',
+ 'voip' => '/^87\\d{7}$/',
+ 'uan' => '/^861\\d{6}$/',
+ 'emergency' => '/^1(?:01(?:11|77)|12)$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{5,9}$/',
+ 'fixed' => '/^\\d{9}$/',
+ 'tollfree' => '/^\\d{9}$/',
+ 'premium' => '/^\\d{9}$/',
+ 'shared' => '/^\\d{9}$/',
+ 'voip' => '/^\\d{9}$/',
+ 'uan' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3,5}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZM.php
new file mode 100644
index 0000000000000000000000000000000000000000..818eb683a42994d67845dc4272030fcceb465e49
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZM.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '260',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^[289]\\d{8}$/',
+ 'fixed' => '/^21[1-8]\\d{6}$/',
+ 'mobile' => '/^9(?:5[05]|6\\d|7[13-9])\\d{6}$/',
+ 'tollfree' => '/^800\\d{6}$/',
+ 'emergency' => '/^(?:112|99[139])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{9}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZW.php
new file mode 100644
index 0000000000000000000000000000000000000000..9fbac98b30e55168dd429281aa1d6b8a9f0f816d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZW.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return array(
+ 'code' => '263',
+ 'patterns' => array(
+ 'national' => array(
+ 'general' => '/^2(?:[012457-9]\\d{3,8}|6\\d{3,6})|[13-79]\\d{4,8}|86\\d{8}$/',
+ 'fixed' => '/^(?:1[3-9]|2(?:0[45]|[16]|2[28]|[49]8?|58[23]|7[246]|8[1346-9])|3(?:08?|17?|3[78]|[2456]|7[1569]|8[379])|5(?:[07-9]|1[78]|483|5(?:7?|8))|6(?:0|28|37?|[45][68][78]|98?)|848)\\d{3,6}|(?:2(?:27|5|7[135789]|8[25])|3[39]|5[1-46]|6[126-8])\\d{4,6}|2(?:0|70)\\d{5,6}|(?:4\\d|9[2-8])\\d{4,7}$/',
+ 'mobile' => '/^7[137]\\d{7}|86(?:22|44)\\d{6}$/',
+ 'voip' => '/^86(?:1[12]|30|8[367]|99)\\d{6}$/',
+ 'emergency' => '/^(?:112|99[3459])$/',
+ ),
+ 'possible' => array(
+ 'general' => '/^\\d{3,10}$/',
+ 'mobile' => '/^\\d{9,10}$/',
+ 'voip' => '/^\\d{10}$/',
+ 'emergency' => '/^\\d{3}$/',
+ ),
+ ),
+);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php
index 36d777d3caa8814631a8d872bd4209486c4d0f0c..4ad577e6b2d85ef8908214210a617fcdb6ee4504 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php
@@ -11,6 +11,7 @@ namespace Zend\I18n\Validator;
use Locale;
use Traversable;
+use Zend\I18n\Exception as I18nException;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Callback;
@@ -226,9 +227,17 @@ class PostCode extends AbstractValidator
* Accepts a string locale and/or "format".
*
* @param array|Traversable $options
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
*/
public function __construct($options = array())
{
+ if (!extension_loaded('intl')) {
+ throw new I18nException\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+
if ($options instanceof Traversable) {
$options = ArrayUtils::iteratorToArray($options);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
index 1a5bfd27d9c95e3e8133075bba5d7643cc57e5c0..d1461e6c3da0227fb9cd7b456197344e7a0c3b46 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
@@ -52,6 +52,7 @@ abstract class AbstractTranslatorHelper extends AbstractHelper implements
if (null !== $textDomain) {
$this->setTranslatorTextDomain($textDomain);
}
+
return $this;
}
@@ -82,8 +83,7 @@ abstract class AbstractTranslatorHelper extends AbstractHelper implements
/**
* Sets whether translator is enabled and should be used
*
- * @param bool $enabled [optional] whether translator should be used.
- * Default is true.
+ * @param bool $enabled
* @return AbstractTranslatorHelper
*/
public function setTranslatorEnabled($enabled = true)
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
index eee0a4dff91fc6c29bb905034c5b5af8ee24c4e4..b43f08e06008acb7e9f0c522af2ab6b21e35d044 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
@@ -11,6 +11,7 @@ namespace Zend\I18n\View\Helper;
use Locale;
use NumberFormatter;
+use Zend\I18n\Exception;
use Zend\View\Helper\AbstractHelper;
/**
@@ -19,18 +20,32 @@ use Zend\View\Helper\AbstractHelper;
class CurrencyFormat extends AbstractHelper
{
/**
- * Locale to use instead of the default.
+ * The 3-letter ISO 4217 currency code indicating the currency to use
+ *
+ * @var string
+ */
+ protected $currencyCode;
+
+ /**
+ * Formatter instances
+ *
+ * @var array
+ */
+ protected $formatters = array();
+
+ /**
+ * Locale to use instead of the default
*
* @var string
*/
protected $locale;
/**
- * The 3-letter ISO 4217 currency code indicating the currency to use.
+ * Currency pattern
*
* @var string
*/
- protected $currencyCode;
+ protected $currencyPattern;
/**
* If set to true, the currency will be returned with two decimals
@@ -40,14 +55,74 @@ class CurrencyFormat extends AbstractHelper
protected $showDecimals = true;
/**
- * Formatter instances.
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+ */
+ public function __construct()
+ {
+ if (!extension_loaded('intl')) {
+ throw new Exception\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+ }
+
+ /**
+ * Format a number
*
- * @var array
+ * @param float $number
+ * @param string $currencyCode
+ * @param bool $showDecimals
+ * @param string $locale
+ * @param string $pattern
+ * @return string
*/
- protected $formatters = array();
+ public function __invoke(
+ $number,
+ $currencyCode = null,
+ $showDecimals = null,
+ $locale = null,
+ $pattern = null
+ ) {
+ if (null === $locale) {
+ $locale = $this->getLocale();
+ }
+ if (null === $currencyCode) {
+ $currencyCode = $this->getCurrencyCode();
+ }
+ if (null !== $showDecimals) {
+ $this->setShouldShowDecimals($showDecimals);
+ }
+ if (null === $pattern) {
+ $pattern = $this->getCurrencyPattern();
+ }
+
+ $formatterId = md5($locale);
+
+ if (!isset($this->formatters[$formatterId])) {
+ $this->formatters[$formatterId] = new NumberFormatter(
+ $locale,
+ NumberFormatter::CURRENCY
+ );
+ }
+
+ if ($pattern !== null) {
+ $this->formatters[$formatterId]->setPattern($pattern);
+ }
+
+ if ($this->shouldShowDecimals()) {
+ $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
+ } else {
+ $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 0);
+ }
+
+ return $this->formatters[$formatterId]->formatCurrency(
+ $number, $currencyCode
+ );
+ }
/**
- * The 3-letter ISO 4217 currency code indicating the currency to use.
+ * The 3-letter ISO 4217 currency code indicating the currency to use
*
* @param string $currencyCode
* @return CurrencyFormat
@@ -59,7 +134,7 @@ class CurrencyFormat extends AbstractHelper
}
/**
- * Get the 3-letter ISO 4217 currency code indicating the currency to use.
+ * Get the 3-letter ISO 4217 currency code indicating the currency to use
*
* @return string
*/
@@ -68,30 +143,31 @@ class CurrencyFormat extends AbstractHelper
return $this->currencyCode;
}
+
/**
- * Set if the view helper should show two decimals
+ * Set the currency pattern
*
- * @param bool $showDecimals
+ * @param string $currencyPattern
* @return CurrencyFormat
*/
- public function setShouldShowDecimals($showDecimals)
+ public function setCurrencyPattern($currencyPattern)
{
- $this->showDecimals = (bool) $showDecimals;
+ $this->currencyPattern = $currencyPattern;
return $this;
}
/**
- * Get if the view helper should show two decimals
+ * Get the currency pattern
*
- * @return bool
+ * @return string
*/
- public function shouldShowDecimals()
+ public function getCurrencyPattern()
{
- return $this->showDecimals;
+ return $this->currencyPattern;
}
/**
- * Set locale to use instead of the default.
+ * Set locale to use instead of the default
*
* @param string $locale
* @return CurrencyFormat
@@ -103,7 +179,7 @@ class CurrencyFormat extends AbstractHelper
}
/**
- * Get the locale to use.
+ * Get the locale to use
*
* @return string|null
*/
@@ -117,47 +193,24 @@ class CurrencyFormat extends AbstractHelper
}
/**
- * Format a number.
+ * Set if the view helper should show two decimals
*
- * @param float $number
- * @param string $currencyCode
- * @param bool $showDecimals
- * @param string $locale
- * @return string
+ * @param bool $showDecimals
+ * @return CurrencyFormat
*/
- public function __invoke(
- $number,
- $currencyCode = null,
- $showDecimals = null,
- $locale = null
- ) {
- if (null === $locale) {
- $locale = $this->getLocale();
- }
- if (null === $currencyCode) {
- $currencyCode = $this->getCurrencyCode();
- }
- if (null !== $showDecimals) {
- $this->setShouldShowDecimals($showDecimals);
- }
-
- $formatterId = md5($locale);
-
- if (!isset($this->formatters[$formatterId])) {
- $this->formatters[$formatterId] = new NumberFormatter(
- $locale,
- NumberFormatter::CURRENCY
- );
- }
-
- if ($this->shouldShowDecimals()) {
- $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
- } else {
- $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 0);
- }
+ public function setShouldShowDecimals($showDecimals)
+ {
+ $this->showDecimals = (bool) $showDecimals;
+ return $this;
+ }
- return $this->formatters[$formatterId]->formatCurrency(
- $number, $currencyCode
- );
+ /**
+ * Get if the view helper should show two decimals
+ *
+ * @return bool
+ */
+ public function shouldShowDecimals()
+ {
+ return $this->showDecimals;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php
index 9ebb9ef39d7b9ac61f8f0d7430526fd55aa03a44..aedef5832a0b90b78d9a9e4bf7579225e86f89d1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php
@@ -21,58 +21,84 @@ use Zend\View\Helper\AbstractHelper;
class DateFormat extends AbstractHelper
{
/**
- * Locale to use instead of the default.
+ * Locale to use instead of the default
*
* @var string
*/
protected $locale;
/**
- * Timezone to use.
+ * Timezone to use
*
* @var string
*/
protected $timezone;
/**
- * Formatter instances.
+ * Formatter instances
*
* @var array
*/
protected $formatters = array();
/**
- * Set timezone to use instead of the default.
- *
- * @param string $timezone
- * @return DateFormat
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
*/
- public function setTimezone($timezone)
+ public function __construct()
{
- $this->timezone = (string) $timezone;
-
- foreach ($this->formatters as $formatter) {
- $formatter->setTimeZoneId($this->timezone);
+ if (!extension_loaded('intl')) {
+ throw new Exception\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
}
- return $this;
}
/**
- * Get the timezone to use.
+ * Format a date
*
- * @return string|null
+ * @param DateTime|int|array $date
+ * @param int $dateType
+ * @param int $timeType
+ * @param string $locale
+ * @param string|null $pattern
+ * @return string
*/
- public function getTimezone()
- {
- if (!$this->timezone) {
- return date_default_timezone_get();
+ public function __invoke(
+ $date,
+ $dateType = IntlDateFormatter::NONE,
+ $timeType = IntlDateFormatter::NONE,
+ $locale = null,
+ $pattern = null
+ ) {
+ if ($locale === null) {
+ $locale = $this->getLocale();
}
- return $this->timezone;
+ $timezone = $this->getTimezone();
+ $formatterId = md5($dateType . "\0" . $timeType . "\0" . $locale ."\0" . $pattern);
+
+ if (!isset($this->formatters[$formatterId])) {
+ $this->formatters[$formatterId] = new IntlDateFormatter(
+ $locale,
+ $dateType,
+ $timeType,
+ $timezone,
+ IntlDateFormatter::GREGORIAN,
+ $pattern
+ );
+ }
+
+ // DateTime support for IntlDateFormatter::format() was only added in 5.3.4
+ if ($date instanceof DateTime && version_compare(PHP_VERSION, '5.3.4', '<')) {
+ $date = $date->getTimestamp();
+ }
+
+ return $this->formatters[$formatterId]->format($date);
}
/**
- * Set locale to use instead of the default.
+ * Set locale to use instead of the default
*
* @param string $locale
* @return DateFormat
@@ -84,7 +110,7 @@ class DateFormat extends AbstractHelper
}
/**
- * Get the locale to use.
+ * Get the locale to use
*
* @return string|null
*/
@@ -98,45 +124,33 @@ class DateFormat extends AbstractHelper
}
/**
- * Format a date.
+ * Set timezone to use instead of the default
*
- * @param DateTime|integer|array $date
- * @param int $dateType
- * @param int $timeType
- * @param string $locale
- * @param string|null $pattern
- * @return string
+ * @param string $timezone
+ * @return DateFormat
*/
- public function __invoke(
- $date,
- $dateType = IntlDateFormatter::NONE,
- $timeType = IntlDateFormatter::NONE,
- $locale = null,
- $pattern = null
- ) {
- if ($locale === null) {
- $locale = $this->getLocale();
- }
-
- $timezone = $this->getTimezone();
- $formatterId = md5($dateType . "\0" . $timeType . "\0" . $locale ."\0" . $pattern);
+ public function setTimezone($timezone)
+ {
+ $this->timezone = (string) $timezone;
- if (!isset($this->formatters[$formatterId])) {
- $this->formatters[$formatterId] = new IntlDateFormatter(
- $locale,
- $dateType,
- $timeType,
- $timezone,
- IntlDateFormatter::GREGORIAN,
- $pattern
- );
+ foreach ($this->formatters as $formatter) {
+ $formatter->setTimeZoneId($this->timezone);
}
- // DateTime support for IntlDateFormatter::format() was only added in 5.3.4
- if ($date instanceof DateTime && version_compare(PHP_VERSION, '5.3.4', '<')) {
- $date = $date->getTimestamp();
+ return $this;
+ }
+
+ /**
+ * Get the timezone to use
+ *
+ * @return string|null
+ */
+ public function getTimezone()
+ {
+ if (!$this->timezone) {
+ return date_default_timezone_get();
}
- return $this->formatters[$formatterId]->format($date);
+ return $this->timezone;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php
index 63b152995f8cedb113e14afeb053ac6e4dd0361d..ab775f5efd56ca76f2022f63baf19a0936a13a1e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php
@@ -11,6 +11,7 @@ namespace Zend\I18n\View\Helper;
use Locale;
use NumberFormatter;
+use Zend\I18n\Exception;
use Zend\View\Helper\AbstractHelper;
/**
@@ -19,37 +20,104 @@ use Zend\View\Helper\AbstractHelper;
class NumberFormat extends AbstractHelper
{
/**
- * Locale to use instead of the default.
+ * number of decimals to use.
*
- * @var string
+ * @var int
*/
- protected $locale;
+ protected $decimals;
/**
- * NumberFormat style to use.
+ * NumberFormat style to use
*
- * @var integer
+ * @var int
*/
protected $formatStyle;
/**
- * NumberFormat type to use.
+ * NumberFormat type to use
*
- * @var integer
+ * @var int
*/
protected $formatType;
/**
- * Formatter instances.
+ * Formatter instances
*
* @var array
*/
protected $formatters = array();
/**
- * Set format style to use instead of the default.
+ * Locale to use instead of the default
+ *
+ * @var string
+ */
+ protected $locale;
+
+ /**
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+ */
+ public function __construct()
+ {
+ if (!extension_loaded('intl')) {
+ throw new Exception\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
+ }
+ }
+
+ /**
+ * Format a number
+ *
+ * @param int|float $number
+ * @param int $formatStyle
+ * @param int $formatType
+ * @param string $locale
+ * @param int $decimals
+ * @return string
+ */
+ public function __invoke(
+ $number,
+ $formatStyle = null,
+ $formatType = null,
+ $locale = null,
+ $decimals = null
+ ) {
+ if (null === $locale) {
+ $locale = $this->getLocale();
+ }
+ if (null === $formatStyle) {
+ $formatStyle = $this->getFormatStyle();
+ }
+ if (null === $formatType) {
+ $formatType = $this->getFormatType();
+ }
+ if (!is_int($decimals) || $decimals < 0) {
+ $decimals = $this->getDecimals();
+ }
+
+ $formatterId = md5($formatStyle . "\0" . $locale . "\0" . $decimals);
+
+ if (!isset($this->formatters[$formatterId])) {
+ $this->formatters[$formatterId] = new NumberFormatter(
+ $locale,
+ $formatStyle
+ );
+
+ if ($decimals !== null) {
+ $this->formatters[$formatterId]->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, $decimals);
+ $this->formatters[$formatterId]->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, $decimals);
+ }
+ }
+
+ return $this->formatters[$formatterId]->format($number, $formatType);
+ }
+
+ /**
+ * Set format style to use instead of the default
*
- * @param integer $formatStyle
+ * @param int $formatStyle
* @return NumberFormat
*/
public function setFormatStyle($formatStyle)
@@ -59,22 +127,23 @@ class NumberFormat extends AbstractHelper
}
/**
- * Get the format style to use.
+ * Get the format style to use
*
- * @return integer
+ * @return int
*/
public function getFormatStyle()
{
if (null === $this->formatStyle) {
$this->formatStyle = NumberFormatter::DECIMAL;
}
+
return $this->formatStyle;
}
/**
- * Set format type to use instead of the default.
+ * Set format type to use instead of the default
*
- * @param integer $formatType
+ * @param int $formatType
* @return NumberFormat
*/
public function setFormatType($formatType)
@@ -84,9 +153,9 @@ class NumberFormat extends AbstractHelper
}
/**
- * Get the format type to use.
+ * Get the format type to use
*
- * @return integer
+ * @return int
*/
public function getFormatType()
{
@@ -96,10 +165,32 @@ class NumberFormat extends AbstractHelper
return $this->formatType;
}
+ /**
+ * Set number of decimals to use instead of the default.
+ *
+ * @param int $decimals
+ * @return NumberFormat
+ */
+ public function setDecimals($decimals)
+ {
+ $this->decimals = $decimals;
+ return $this;
+ }
+
+ /**
+ * Get number of decimals.
+ *
+ * @return int
+ */
+ public function getDecimals()
+ {
+ return $this->decimals;
+ }
+
/**
* Set locale to use instead of the default.
*
- * @param string $locale
+ * @param string $locale
* @return NumberFormat
*/
public function setLocale($locale)
@@ -109,7 +200,7 @@ class NumberFormat extends AbstractHelper
}
/**
- * Get the locale to use.
+ * Get the locale to use
*
* @return string|null
*/
@@ -121,41 +212,4 @@ class NumberFormat extends AbstractHelper
return $this->locale;
}
-
- /**
- * Format a number.
- *
- * @param integer|float $number
- * @param integer $formatStyle
- * @param integer $formatType
- * @param string $locale
- * @return string
- */
- public function __invoke(
- $number,
- $formatStyle = null,
- $formatType = null,
- $locale = null
- ) {
- if (null === $locale) {
- $locale = $this->getLocale();
- }
- if (null === $formatStyle) {
- $formatStyle = $this->getFormatStyle();
- }
- if (null === $formatType) {
- $formatType = $this->getFormatType();
- }
-
- $formatterId = md5($formatStyle . "\0" . $locale);
-
- if (!isset($this->formatters[$formatterId])) {
- $this->formatters[$formatterId] = new NumberFormatter(
- $locale,
- $formatStyle
- );
- }
-
- return $this->formatters[$formatterId]->format($number, $formatType);
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php
index a6fa185a72f0bed388a642253156fce9ffa190bd..4bff0f24c290f4300b6b59c948ea4fb41a2849d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php
@@ -28,27 +28,23 @@ use Zend\View\Helper\AbstractHelper;
class Plural extends AbstractHelper
{
/**
- * Rule to use
+ * Plural rule to use
*
* @var PluralRule
*/
protected $rule;
/**
- * Set the plural rule to use
- *
- * @param PluralRule|string $pluralRule
- * @return Plural
+ * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
*/
- public function setPluralRule($pluralRule)
+ public function __construct()
{
- if (!$pluralRule instanceof PluralRule) {
- $pluralRule = PluralRule::fromString($pluralRule);
+ if (!extension_loaded('intl')) {
+ throw new Exception\ExtensionNotLoadedException(sprintf(
+ '%s component requires the intl PHP extension',
+ __NAMESPACE__
+ ));
}
-
- $this->rule = $pluralRule;
-
- return $this;
}
/**
@@ -62,7 +58,7 @@ class Plural extends AbstractHelper
*/
public function __invoke($strings, $number)
{
- if ($this->rule === null) {
+ if (null === $this->getPluralRule()) {
throw new Exception\InvalidArgumentException(sprintf(
'No plural rule was set'
));
@@ -72,8 +68,35 @@ class Plural extends AbstractHelper
$strings = (array) $strings;
}
- $pluralIndex = $this->rule->evaluate($number);
+ $pluralIndex = $this->getPluralRule()->evaluate($number);
return $strings[$pluralIndex];
}
+
+ /**
+ * Set the plural rule to use
+ *
+ * @param PluralRule|string $pluralRule
+ * @return Plural
+ */
+ public function setPluralRule($pluralRule)
+ {
+ if (!$pluralRule instanceof PluralRule) {
+ $pluralRule = PluralRule::fromString($pluralRule);
+ }
+
+ $this->rule = $pluralRule;
+
+ return $this;
+ }
+
+ /**
+ * Get the plural rule to use
+ *
+ * @return PluralRule
+ */
+ public function getPluralRule()
+ {
+ return $this->rule;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php
index 66e1f84395241d5e5abedc6a1be0a5114aae72fb..9992124bf82a3758cd5da3b6066aa9d1efb2ce36 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php
@@ -17,13 +17,13 @@ use Zend\I18n\Exception;
class Translate extends AbstractTranslatorHelper
{
/**
- * Translate a message.
+ * Translate a message
*
* @param string $message
* @param string $textDomain
* @param string $locale
- * @return string
* @throws Exception\RuntimeException
+ * @return string
*/
public function __invoke($message, $textDomain = null, $locale = null)
{
@@ -34,6 +34,7 @@ class Translate extends AbstractTranslatorHelper
if (null === $textDomain) {
$textDomain = $this->getTranslatorTextDomain();
}
+
return $translator->translate($message, $textDomain, $locale);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php
index 1c5faad9d3f9930c359c93d6803739e0102ca687..1bf184f0117d1c6ff897401a59b98d6c19bd4b0a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php
@@ -17,15 +17,15 @@ use Zend\I18n\Exception;
class TranslatePlural extends AbstractTranslatorHelper
{
/**
- * Translate a plural message.
+ * Translate a plural message
*
* @param string $singular
* @param string $plural
- * @param integer $number
+ * @param int $number
* @param string $textDomain
* @param string $locale
- * @return string
* @throws Exception\RuntimeException
+ * @return string
*/
public function __invoke(
$singular,
@@ -42,6 +42,7 @@ class TranslatePlural extends AbstractTranslatorHelper
if (null === $textDomain) {
$textDomain = $this->getTranslatorTextDomain();
}
+
return $translator->translatePlural($singular, $plural, $number, $textDomain, $locale);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php
index 9c922146265cb3e47ce190352d310f0fed6a730f..437661d2e4347003a0c23ebbff33f295569154d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php
@@ -18,7 +18,9 @@ use Zend\ServiceManager\ServiceManager;
class HelperConfig implements ConfigInterface
{
/**
- * @var array Pre-aliased view helpers
+ * Pre-aliased view helpers
+ *
+ * @var array
*/
protected $invokables = array(
'currencyformat' => 'Zend\I18n\View\Helper\CurrencyFormat',
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/composer.json b/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
index cebe6537cde0fc07a1db09768e9ee23f4875cc69..a2b1993c209e667fc4f06bd7ae0fa8e3b152ca4f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
@@ -14,18 +14,19 @@
"target-dir": "Zend/I18n",
"require": {
"php": ">=5.3.3",
- "ext-intl": "*",
"zendframework/zend-stdlib": "self.version"
},
"suggest": {
+ "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
+ "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
"zendframework/zend-filter": "You should install this package to use the provided filters",
"zendframework/zend-validator": "You should install this package to use the provided validators",
"zendframework/zend-view": "You should install this package to use the provided view helpers"
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dec0151b1bd028e7a356831ec2d8c5b0ee17159
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\InputFilter;
+
+class ArrayInput extends Input
+{
+ /**
+ * @var array
+ */
+ protected $value = array();
+
+ /**
+ * @param array $value
+ * @return Input
+ */
+ public function setValue($value)
+ {
+ if (!is_array($value)) {
+ throw new Exception\InvalidArgumentException(
+ sprintf('Value must be an array, %s given.', gettype($value))
+ );
+ }
+ return parent::setValue($value);
+ }
+
+ /**
+ * @return array
+ */
+ public function getValue()
+ {
+ $filter = $this->getFilterChain();
+ $result = array();
+ foreach ($this->value as $key => $value) {
+ $result[$key] = $filter->filter($value);
+ }
+ return $result;
+ }
+
+ /**
+ * @param mixed $context Extra "context" to provide the validator
+ * @return bool
+ */
+ public function isValid($context = null)
+ {
+ $this->injectNotEmptyValidator();
+ $validator = $this->getValidatorChain();
+ $values = $this->getValue();
+ $result = true;
+ foreach ($values as $value) {
+ $result = $validator->isValid($value, $context);
+ if (!$result) {
+ if ($fallbackValue = $this->getFallbackValue()) {
+ $this->setValue($fallbackValue);
+ $result = true;
+ }
+ break;
+ }
+ }
+
+ return $result;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
index 47560e4cb87a1add8667cf2f54bd084a9dcff709..0348a9d684461a3faa27687d72da9e3514682b77 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
@@ -12,12 +12,13 @@ namespace Zend\InputFilter;
use ArrayAccess;
use Traversable;
use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\InitializableInterface;
/**
* @todo How should we deal with required input when data is missing?
* should a message be returned? if so, what message?
*/
-class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInterface
+class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInterface, InitializableInterface
{
protected $data;
protected $inputs = array();
@@ -25,6 +26,16 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
protected $validationGroup;
protected $validInputs;
+ /**
+ * This function is automatically called when creating element with factory. It
+ * allows to perform various operations (add elements...)
+ *
+ * @return void
+ */
+ public function init()
+ {
+ }
+
/**
* Countable: number of inputs in this input filter
*
@@ -152,42 +163,124 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
));
}
+ $inputs = $this->validationGroup ?: array_keys($this->inputs);
+ return $this->validateInputs($inputs);
+ }
+
+ /**
+ * Validate a set of inputs against the current data
+ *
+ * @param array $inputs
+ * @return bool
+ */
+ protected function validateInputs(array $inputs)
+ {
$this->validInputs = array();
$this->invalidInputs = array();
$valid = true;
- $inputs = $this->validationGroup ?: array_keys($this->inputs);
foreach ($inputs as $name) {
- $input = $this->inputs[$name];
- if (!array_key_exists($name, $this->data)
- || (null === $this->data[$name])
- || (is_string($this->data[$name]) && strlen($this->data[$name]) === 0)
- // Single and Multi File Uploads
- || (is_array($this->data[$name])
- && isset($this->data[$name]['error']) && $this->data[$name]['error'] === UPLOAD_ERR_NO_FILE)
- || (is_array($this->data[$name]) && count($this->data[$name]) === 1
- && isset($this->data[$name][0]) && is_array($this->data[$name][0])
- && isset($this->data[$name][0]['error']) && $this->data[$name][0]['error'] === UPLOAD_ERR_NO_FILE)
+ $input = $this->inputs[$name];
+ $dataExists = array_key_exists($name, $this->data);
+
+ // key doesn't exist, but input is not required; valid
+ if (!$dataExists
+ && $input instanceof InputInterface
+ && !$input->isRequired()
) {
- if ($input instanceof InputInterface) {
- // - test if input is required
- if (!$input->isRequired()
- // "Not required" should not apply to empty strings (#3983)
- && !(array_key_exists($name, $this->data) && is_string($this->data[$name]))
- ) {
- $this->validInputs[$name] = $input;
- continue;
- }
- // - test if input allows empty
- if ($input->allowEmpty()) {
- $this->validInputs[$name] = $input;
- continue;
- }
+ $this->validInputs[$name] = $input;
+ continue;
+ }
+
+ // key doesn't exist, input is required, allows empty; valid if
+ // continueIfEmpty is false or input doesn't implement
+ // that interface; otherwise validation chain continues
+ if (!$dataExists
+ && $input instanceof InputInterface
+ && $input->isRequired()
+ && $input->allowEmpty()
+ ) {
+ if(!($input instanceOf EmptyContextInterface && $input->continueIfEmpty())) {
+ $this->validInputs[$name] = $input;
+ continue;
+ }
+ }
+
+ // key exists, is null, input is not required; valid
+ if ($dataExists
+ && null === $this->data[$name]
+ && $input instanceof InputInterface
+ && !$input->isRequired()
+ ) {
+ $this->validInputs[$name] = $input;
+ continue;
+ }
+
+ // key exists, is null, input is required, allows empty; valid if
+ // continueIfEmpty is false or input doesn't implement
+ // that interface; otherwise validation chain continues
+ if ($dataExists
+ && null === $this->data[$name]
+ && $input instanceof InputInterface
+ && $input->isRequired()
+ && $input->allowEmpty()
+ ) {
+ if (!($input instanceof EmptyContextInterface && $input->continueIfEmpty())) {
+ $this->validInputs[$name] = $input;
+ continue;
+ }
+ }
+
+ // key exists, empty string, input is not required, allows empty; valid
+ if ($dataExists
+ && '' === $this->data[$name]
+ && $input instanceof InputInterface
+ && !$input->isRequired()
+ ) {
+ $this->validInputs[$name] = $input;
+ continue;
+ }
+
+ // key exists, empty string, input is required, allows empty; valid
+ // if continueIfEmpty is false, otherwise validation continues
+ if ($dataExists
+ && '' === $this->data[$name]
+ && $input instanceof InputInterface
+ && $input->isRequired()
+ && $input->allowEmpty()
+ ) {
+ if (!($input instanceof EmptyContextInterface && $input->continueIfEmpty())) {
+ $this->validInputs[$name] = $input;
+ continue;
}
- // make sure we have a value (empty) for validation
+ }
+
+ // key exists, is array representing file, no file present, input not
+ // required or allows empty; valid
+ if ($dataExists
+ && is_array($this->data[$name])
+ && (
+ (isset($this->data[$name]['error'])
+ && $this->data[$name]['error'] === UPLOAD_ERR_NO_FILE)
+ || (count($this->data[$name]) === 1
+ && isset($this->data[$name][0])
+ && is_array($this->data[$name][0])
+ && isset($this->data[$name][0]['error'])
+ && $this->data[$name][0]['error'] === UPLOAD_ERR_NO_FILE)
+ )
+ && $input instanceof InputInterface
+ && (!$input->isRequired() || $input->allowEmpty())
+ ) {
+ $this->validInputs[$name] = $input;
+ continue;
+ }
+
+ // make sure we have a value (empty) for validation
+ if (!$dataExists) {
$this->data[$name] = null;
}
+ // Validate an input filter
if ($input instanceof InputFilterInterface) {
if (!$input->isValid()) {
$this->invalidInputs[$name] = $input;
@@ -197,6 +290,8 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
$this->validInputs[$name] = $input;
continue;
}
+
+ // Validate an input
if ($input instanceof InputInterface) {
if (!$input->isValid($this->data)) {
// Validation failure
@@ -390,6 +485,7 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
foreach ($this->getInvalidInput() as $name => $input) {
$messages[$name] = $input->getMessages();
}
+
return $messages;
}
@@ -498,4 +594,14 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
return $unknownInputs;
}
+
+ /**
+ * Get an array of all inputs
+ *
+ * @return array
+ */
+ public function getInputs()
+ {
+ return $this->inputs;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
new file mode 100644
index 0000000000000000000000000000000000000000..8aa8a933c82fce791f0539eed485601f7d75d183
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\InputFilter;
+
+use Traversable;
+
+class CollectionInputFilter extends InputFilter
+{
+ /*
+ * @var array
+ */
+ protected $collectionData;
+
+ /*
+ * @var array
+ */
+ protected $collectionValidInputs;
+
+ /*
+ * @var array
+ */
+ protected $collectionInvalidInputs;
+
+ /*
+ * @var bool
+ */
+ protected $isRequired = false;
+
+ /*
+ * @var int
+ */
+ protected $count = null;
+
+ /*
+ * @var array
+ */
+ protected $collectionValues = array();
+
+ /*
+ * @var array
+ */
+ protected $collectionRawValues = array();
+
+ /**
+ * @var BaseInputFilter
+ */
+ protected $inputFilter;
+
+ /**
+ * Set the input filter to use when looping the data
+ *
+ * @param BaseInputFilter|array|Traversable $inputFilter
+ * @return CollectionInputFilter
+ */
+ public function setInputFilter($inputFilter)
+ {
+ if (is_array($inputFilter) || $inputFilter instanceof Traversable) {
+ $inputFilter = $this->getFactory()->createInputFilter($inputFilter);
+ }
+
+ if (!$inputFilter instanceof BaseInputFilter) {
+ throw new Exception\RuntimeException(sprintf(
+ '%s expects an instance of %s; received "%s"',
+ __METHOD__,
+ 'Zend\InputFilter\BaseInputFilter',
+ (is_object($inputFilter) ? get_class($inputFilter) : gettype($inputFilter))
+ ));
+ }
+
+ $this->inputFilter = $inputFilter;
+ $this->inputs = $inputFilter->getInputs();
+ return $this;
+ }
+
+ /**
+ * Get the input filter used when looping the data
+ *
+ * @return BaseInputFilter
+ */
+ public function getInputFilter()
+ {
+ if (null === $this->inputFilter) {
+ $this->setInputFilter(new InputFilter());
+ }
+ return $this->inputFilter;
+ }
+
+ /**
+ * Set if the collection can be empty
+ *
+ * @param bool $isRequired
+ * @return CollectionInputFilter
+ */
+ public function setIsRequired($isRequired)
+ {
+ $this->isRequired = $isRequired;
+ return $this;
+ }
+
+ /**
+ * Get if collection can be empty
+ *
+ * @return bool
+ */
+ public function getIsRequired()
+ {
+ return $this->isRequired;
+ }
+
+
+ /**
+ * Set the count of data to validate
+ *
+ * @param int $count
+ * @return CollectionInputFilter
+ */
+ public function setCount($count)
+ {
+ $this->count = $count > 0 ? $count : 0;
+ return $this;
+ }
+
+ /**
+ * Get the count of data to validate, use the count of data by default
+ *
+ * @return int
+ */
+ public function getCount()
+ {
+ if (null === $this->count) {
+ $this->count = count($this->collectionData);
+ }
+ return $this->count;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setData($data)
+ {
+ $this->collectionData = array_values($data);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isValid()
+ {
+ $valid = true;
+
+ if ($this->getCount() < 1) {
+ if ($this->isRequired) {
+ $valid = false;
+ }
+ return $valid;
+ }
+
+ $inputCollection = array_fill(0, $this->getCount(), $this->validationGroup ?: array_keys($this->inputs));
+
+ foreach ($inputCollection as $key => $inputs) {
+ $this->data = array();
+ if (isset($this->collectionData[$key])) {
+ $this->data = $this->collectionData[$key];
+ }
+ $this->populate();
+
+ if ($this->validateInputs($inputs)) {
+ $this->collectionValidInputs[$key] = $this->validInputs;
+ } else {
+ $this->collectionInvalidInputs[$key] = $this->invalidInputs;
+ $valid = false;
+ }
+
+ $values = array();
+ $rawValues = array();
+ foreach ($inputs as $name) {
+ $input = $this->inputs[$name];
+
+ if ($input instanceof InputFilterInterface) {
+ $values[$name] = $input->getValues();
+ $rawValues[$name] = $input->getRawValues();
+ continue;
+ }
+ $values[$name] = $input->getValue($this->data);
+ $rawValues[$name] = $input->getRawValue();
+ }
+ $this->collectionValues[$key] = $values;
+ $this->collectionRawValues[$key] = $rawValues;
+ }
+
+ return $valid;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setValidationGroup($name)
+ {
+ if ($name === self::VALIDATE_ALL) {
+ $this->validationGroup = null;
+ return $this;
+ }
+
+ if (is_array($name)) {
+ // Best effort check if the validation group was set by a form for BC
+ if (count($name) == count($this->collectionData) && is_array(reset($name))) {
+ return parent::setValidationGroup(reset($name));
+ }
+ return parent::setValidationGroup($name);
+ }
+
+ return parent::setValidationGroup(func_get_args());
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getInvalidInput()
+ {
+ return (is_array($this->collectionInvalidInputs) ? $this->collectionInvalidInputs : array());
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getValidInput()
+ {
+ return (is_array($this->collectionValidInputs) ? $this->collectionValidInputs : array());
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getValues()
+ {
+ return $this->collectionValues;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getRawValues()
+ {
+ return $this->collectionRawValues;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getMessages()
+ {
+ $messages = array();
+ foreach ($this->getInvalidInput() as $key => $inputs) {
+ foreach ($inputs as $name => $input) {
+ $messages[$key][$name] = $input->getMessages();
+ }
+ }
+ return $messages;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..72933b1862db943ca6d32980d72831ef0947fd2d
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\InputFilter;
+
+interface EmptyContextInterface
+{
+ public function setContinueIfEmpty($continueIfEmpty);
+
+ public function continueIfEmpty();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
index dddc6f5750104c7e9579f29eee4ed103e37c4e5f..d75e4c7deac1799669caa693f5ff5a8dc083fb8a 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
@@ -12,14 +12,39 @@ namespace Zend\InputFilter;
use Traversable;
use Zend\Filter\FilterChain;
use Zend\Stdlib\ArrayUtils;
-use Zend\Validator\ValidatorChain;
use Zend\Validator\ValidatorInterface;
+use Zend\Validator\ValidatorChain;
class Factory
{
+ /**
+ * @var FilterChain
+ */
protected $defaultFilterChain;
+
+ /**
+ * @var ValidatorChain
+ */
protected $defaultValidatorChain;
+ /**
+ * @var InputFilterPluginManager
+ */
+ protected $inputFilterManager;
+
+ /**
+ * @param InputFilterPluginManager $inputFilterManager
+ */
+ public function __construct(InputFilterPluginManager $inputFilterManager = null)
+ {
+ if ($inputFilterManager) {
+ $this->setInputFilterManager($inputFilterManager);
+ }
+
+ $this->defaultFilterChain = new FilterChain();
+ $this->defaultValidatorChain = new ValidatorChain();
+ }
+
/**
* Set default filter chain to use
*
@@ -84,6 +109,29 @@ class Factory
$this->defaultValidatorChain = null;
}
+ /**
+ * @param InputFilterPluginManager $inputFilterManager
+ * @return self
+ */
+ public function setInputFilterManager(InputFilterPluginManager $inputFilterManager)
+ {
+ $this->inputFilterManager = $inputFilterManager;
+
+ return $this;
+ }
+
+ /**
+ * @return InputFilterPluginManager
+ */
+ public function getInputFilterManager()
+ {
+ if (null === $this->inputFilterManager) {
+ $this->inputFilterManager = new InputFilterPluginManager;
+ }
+
+ return $this->inputFilterManager;
+ }
+
/**
* Factory for input objects
*
@@ -106,8 +154,14 @@ class Factory
}
$class = 'Zend\InputFilter\Input';
+
if (isset($inputSpecification['type'])) {
$class = $inputSpecification['type'];
+
+ if ($this->getInputFilterManager()->has($class)) {
+ return $this->createInputFilter($inputSpecification);
+ }
+
if (!class_exists($class)) {
throw new Exception\RuntimeException(sprintf(
'Input factory expects the "type" to be a valid class; received "%s"',
@@ -153,9 +207,11 @@ class Factory
$input->setRequired(!$value);
}
break;
+ case 'continue_if_empty':
+ $input->setContinueIfEmpty($inputSpecification['continue_if_empty']);
+ break;
case 'error_message':
$input->setErrorMessage($value);
- break;
case 'fallback_value':
$input->setFallbackValue($value);
break;
@@ -217,23 +273,23 @@ class Factory
$inputFilterSpecification = ArrayUtils::iteratorToArray($inputFilterSpecification);
}
- $class = 'Zend\InputFilter\InputFilter';
+ $type = 'Zend\InputFilter\InputFilter';
+
if (isset($inputFilterSpecification['type']) && is_string($inputFilterSpecification['type'])) {
- $class = $inputFilterSpecification['type'];
- if (!class_exists($class)) {
- throw new Exception\RuntimeException(sprintf(
- 'Input factory expects the "type" to be a valid class; received "%s"',
- $class
- ));
- }
+ $type = $inputFilterSpecification['type'];
unset($inputFilterSpecification['type']);
}
- $inputFilter = new $class();
- if (!$inputFilter instanceof InputFilterInterface) {
- throw new Exception\RuntimeException(sprintf(
- 'InputFilter factory expects the "type" to be a class implementing %s; received "%s"',
- 'Zend\InputFilter\InputFilterInterface', $class));
+ $inputFilter = $this->getInputFilterManager()->get($type);
+
+ if ($inputFilter instanceof CollectionInputFilter) {
+ if (isset($inputFilterSpecification['input_filter'])) {
+ $inputFilter->setInputFilter($inputFilterSpecification['input_filter']);
+ }
+ if (isset($inputFilterSpecification['count'])) {
+ $inputFilter->setCount($inputFilterSpecification['count']);
+ }
+ return $inputFilter;
}
foreach ($inputFilterSpecification as $key => $value) {
@@ -252,6 +308,11 @@ class Factory
return $inputFilter;
}
+ /**
+ * @param FilterChain $chain
+ * @param array|Traversable $filters
+ * @return void
+ */
protected function populateFilters(FilterChain $chain, $filters)
{
foreach ($filters as $filter) {
@@ -282,6 +343,11 @@ class Factory
}
}
+ /**
+ * @param ValidatorChain $chain
+ * @param array|Traversable $validators
+ * @return void
+ */
protected function populateValidators(ValidatorChain $chain, $validators)
{
foreach ($validators as $validator) {
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php
index 110f4f58d17ce300179df42c25395b15b3e2e20f..76a8bd4d09590394c6c206cc22918047df44069a 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php
@@ -28,17 +28,17 @@ use Zend\Validator\File\UploadFile as UploadValidator;
class FileInput extends Input
{
/**
- * @var boolean
+ * @var bool
*/
protected $isValid = false;
/**
- * @var boolean
+ * @var bool
*/
protected $autoPrependUploadValidator = true;
/**
- * @param boolean $value Enable/Disable automatically prepending an Upload validator
+ * @param bool $value Enable/Disable automatically prepending an Upload validator
* @return FileInput
*/
public function setAutoPrependUploadValidator($value)
@@ -48,7 +48,7 @@ class FileInput extends Input
}
/**
- * @return boolean
+ * @return bool
*/
public function getAutoPrependUploadValidator()
{
@@ -85,7 +85,7 @@ class FileInput extends Input
/**
* @param mixed $context Extra "context" to provide the validator
- * @return boolean
+ * @return bool
*/
public function isValid($context = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
index 277340be139d3e7d1f78de4f4cad0bd54791fd06..e4cf2bf0bd880bdd97e73728fd5848f3969b8916 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
@@ -10,16 +10,21 @@
namespace Zend\InputFilter;
use Zend\Filter\FilterChain;
-use Zend\Validator\ValidatorChain;
use Zend\Validator\NotEmpty;
+use Zend\Validator\ValidatorChain;
-class Input implements InputInterface
+class Input implements InputInterface, EmptyContextInterface
{
/**
* @var bool
*/
protected $allowEmpty = false;
+ /**
+ * @var bool
+ */
+ protected $continueIfEmpty = false;
+
/**
* @var bool
*/
@@ -90,6 +95,16 @@ class Input implements InputInterface
return $this;
}
+ /**
+ * @param bool $continueIfEmpty
+ * @return \Zend\InputFilter\Input
+ */
+ public function setContinueIfEmpty($continueIfEmpty)
+ {
+ $this->continueIfEmpty = (bool) $continueIfEmpty;
+ return $this;
+ }
+
/**
* @param string|null $errorMessage
* @return Input
@@ -176,6 +191,14 @@ class Input implements InputInterface
return $this->breakOnFailure;
}
+ /**
+ * @return bool
+ */
+ public function continueIfEmpty()
+ {
+ return $this->continueIfEmpty;
+ }
+
/**
* @return string|null
*/
@@ -274,7 +297,12 @@ class Input implements InputInterface
*/
public function isValid($context = null)
{
- $this->injectNotEmptyValidator();
+ // Empty value needs further validation if continueIfEmpty is set
+ // so don't inject NotEmpty validator which would always
+ // mark that as false
+ if (!$this->continueIfEmpty()) {
+ $this->injectNotEmptyValidator();
+ }
$validator = $this->getValidatorChain();
$value = $this->getValue();
$result = $validator->isValid($value, $context);
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php
new file mode 100644
index 0000000000000000000000000000000000000000..757e3dc258d585cd1708378a01189e9805fc8fd6
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\InputFilter;
+
+use Zend\InputFilter\Exception;
+use Zend\ServiceManager\AbstractPluginManager;
+use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Stdlib\InitializableInterface;
+
+/**
+ * Plugin manager implementation for input filters.
+ */
+class InputFilterPluginManager extends AbstractPluginManager
+{
+ /**
+ * Default set of plugins
+ *
+ * @var array
+ */
+ protected $invokableClasses = array(
+ 'inputfilter' => 'Zend\InputFilter\InputFilter',
+ 'collection' => 'Zend\InputFilter\CollectionInputFilter',
+ );
+
+ /**
+ * Whether or not to share by default
+ *
+ * @var bool
+ */
+ protected $shareByDefault = false;
+
+ /**
+ * @param ConfigInterface $configuration
+ */
+ public function __construct(ConfigInterface $configuration = null)
+ {
+ parent::__construct($configuration);
+
+ $this->addInitializer(array($this, 'populateFactory'));
+ }
+
+ /**
+ * Inject this and populate the factory with filter chain and validator chain
+ *
+ * @param $inputfilter
+ */
+ public function populateFactory($inputfilter)
+ {
+ if ($inputfilter instanceof InputFilter) {
+ $factory = $inputfilter->getFactory();
+
+ $factory->setInputFilterManager($this);
+
+ if ($this->serviceLocator instanceof ServiceLocatorInterface) {
+ $factory->getDefaultFilterChain()->setPluginManager($this->serviceLocator->get('FilterManager'));
+ $factory->getDefaultValidatorChain()->setPluginManager($this->serviceLocator->get('ValidatorManager'));
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function validatePlugin($plugin)
+ {
+ if ($plugin instanceof InputFilterInterface) {
+ // Hook to perform various initialization, when the inputfilter is not created through the factory
+ if ($plugin instanceof InitializableInterface) {
+ $plugin->init();
+ }
+
+ // we're okay
+ return;
+ }
+
+ throw new Exception\RuntimeException(sprintf(
+ 'Plugin of type %s is invalid; must implement Zend\InputFilter\InputFilterInterface',
+ (is_object($plugin) ? get_class($plugin) : gettype($plugin))
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json b/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json
index d64678fd8aed9c094b7d8035249dfbd701b6f717..b82d5f23693164075cbfca9cfb05a6873932cca0 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json
@@ -18,10 +18,13 @@
"zendframework/zend-validator": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "suggest": {
+ "zendframework/zend-servicemanager": "To support plugin manager support"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php b/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php
index 7783d8f7d2b6aecff8eaa497740874a54d8890be..59c92f92085b641498fc6911bcd3f25d02b67f4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php
@@ -78,12 +78,11 @@ class Decoder
/**
* Constructor
*
- * @param string $source String source to decode
- * @param int $decodeType How objects should be decoded -- see
+ * @param string $source String source to decode
+ * @param int $decodeType How objects should be decoded -- see
* {@link Zend\Json\Json::TYPE_ARRAY} and {@link Zend\Json\Json::TYPE_OBJECT} for
* valid values
* @throws InvalidArgumentException
- * @return void
*/
protected function __construct($source, $decodeType)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Expr.php b/vendor/zendframework/zendframework/library/Zend/Json/Expr.php
index 0cd75a60915530798ca9699cd4c6cb5754821d7a..df02d862d49ffa4bc079b2c4f6520a4f43329830 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Expr.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Expr.php
@@ -19,8 +19,8 @@ namespace Zend\Json;
* Example:
* <code>
* $foo = array(
- * 'integer' =>9,
- * 'string' =>'test string',
+ * 'integer' => 9,
+ * 'string' => 'test string',
* 'function' => Zend\Json\Expr(
* 'function() { window.alert("javascript function encoded by Zend\Json\Json") }'
* ),
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Json.php b/vendor/zendframework/zendframework/library/Zend/Json/Json.php
index 68a125f5464f71a49306f203c6d9c97234c6228a..84f5bc65022a07eacd907c6a557e3f2ca3d1ec83 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Json.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Json.php
@@ -220,7 +220,7 @@ class Json
*
* @param SimpleXMLElement $simpleXmlElementObject
* @param bool $ignoreXmlAttributes
- * @param integer $recursionDepth
+ * @param int $recursionDepth
* @throws Exception\RecursionException if the XML tree is deeper than the allowed limit.
* @return array
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
index 85cf3278f5ffa48375f75fb6fc6bec42e6d0eb27..6597dcc6914245f6e3ceca6a365fb164aaad0adc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
@@ -155,8 +155,8 @@ class Server extends AbstractServer
* Handle request
*
* @param Request $request
- * @throws Exception\InvalidArgumentException
* @return null|Response
+ * @throws Exception\InvalidArgumentException
*/
public function handle($request = false)
{
@@ -507,11 +507,10 @@ class Server extends AbstractServer
}
//Make sure named parameters are passed in correct order
- if (is_string( key( $params ) )) {
-
+ if (is_string(key($params))) {
$callback = $invokable->getCallback();
if ('function' == $callback->getType()) {
- $reflection = new ReflectionFunction( $callback->getFunction() );
+ $reflection = new ReflectionFunction($callback->getFunction());
} else {
$reflection = new ReflectionMethod(
@@ -523,9 +522,9 @@ class Server extends AbstractServer
$orderedParams = array();
foreach ($reflection->getParameters() as $refParam) {
if (array_key_exists($refParam->getName(), $params)) {
- $orderedParams[ $refParam->getName() ] = $params[ $refParam->getName() ];
+ $orderedParams[$refParam->getName()] = $params[$refParam->getName()];
} elseif ($refParam->isOptional()) {
- $orderedParams[ $refParam->getName() ] = null;
+ $orderedParams[$refParam->getName()] = null;
} else {
return $this->fault('Invalid params', Error::ERROR_INVALID_PARAMS);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/composer.json b/vendor/zendframework/zendframework/library/Zend/Json/composer.json
index f9af106f119027af5234242820a7492e3b77fdf0..b9996f9db225624ed94f4a50504dbe1dcfd376bd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Json/composer.json
@@ -21,8 +21,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php
index 063b980478360d50da5c6a37eda4fce364231f0d..56fabc6b9dc422509cd639e6866d00ba1aaf291d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php
@@ -64,7 +64,7 @@ class Attribute
*
* @param array $data
* @param string $attribName
- * @param integer $index
+ * @param int $index
* @return array|mixed
*/
public static function getAttribute(array $data, $attribName, $index = null)
@@ -283,7 +283,7 @@ class Attribute
*
* @param array $data
* @param string $attribName
- * @param integer|array|\Traversable $value
+ * @param int|array|\Traversable $value
* @param bool $utc
* @param bool $append
*/
@@ -310,7 +310,7 @@ class Attribute
}
/**
- * @param integer $value
+ * @param int $value
* @param bool $utc
* @return string|null
*/
@@ -328,8 +328,8 @@ class Attribute
*
* @param array $data
* @param string $attribName
- * @param integer $index
- * @return array|integer
+ * @param int $index
+ * @return array|int
*/
public static function getDateTimeAttribute(array $data, $attribName, $index = null)
{
@@ -353,7 +353,7 @@ class Attribute
/**
* @param string|DateTime $value
- * @return integer|null
+ * @return int|null
*/
private static function valueFromLdapDateTime($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
index 22a6bfad3d411ec4bb07288d60cf9d6c6e5018ed..1dd517e09302a0f82e8c6b761c5bbc48d6e13826 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
@@ -24,7 +24,7 @@ class Collection implements \Iterator, \Countable
/**
* Current item number
*
- * @var integer
+ * @var int
*/
protected $current = -1;
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
index e0dbf886c8bda74d563ab04b813b9bf95eb366dc..1e83855b5d2596c314100eb0b5f7e9ce0a6000aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
@@ -47,7 +47,7 @@ class DefaultIterator implements \Iterator, \Countable
/**
* Number of items in query result
*
- * @var integer
+ * @var int
*/
protected $itemCount = -1;
@@ -124,7 +124,7 @@ class DefaultIterator implements \Iterator, \Countable
* or a valid callback accepting the attribute's name as it's only
* argument and returning the new attribute's name.
*
- * @param integer|callable $attributeNameTreatment
+ * @param int|callable $attributeNameTreatment
* @return DefaultIterator Provides a fluent interface
*/
public function setAttributeNameTreatment($attributeNameTreatment)
@@ -159,7 +159,7 @@ class DefaultIterator implements \Iterator, \Countable
/**
* Returns the currently set attribute name treatment
*
- * @return integer|callable
+ * @return int|callable
*/
public function getAttributeNameTreatment()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php
index bbad0fb0f8066683e5e9c015e281c9f966ef9ce7..7b7f0833f8339a5455f03e6059688a2e5fc9e8b3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php
@@ -123,7 +123,7 @@ class Converter
* The date-entity <var>$date</var> can be either a timestamp, a
* DateTime Object, a string that is parseable by strtotime().
*
- * @param integer|string|DateTime $date The date-entity
+ * @param int|string|DateTime $date The date-entity
* @param bool $asUtc Whether to return the LDAP-compatible date-string as UTC or as local value
* @return string
* @throws Exception\InvalidArgumentException
@@ -158,7 +158,7 @@ class Converter
* case-insensitive string 'true' to an LDAP-compatible 'TRUE'. All other
* other values are converted to an LDAP-compatible 'FALSE'.
*
- * @param bool|integer|string $value The boolean value to encode
+ * @param bool|int|string $value The boolean value to encode
* @return string
*/
public static function toLdapBoolean($value)
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
index 81f29fec72bdfb9588cf7fe014c700739546a8f9..cb872f8f1b5eb486bc6df248c4c700924fb98697 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
@@ -455,7 +455,7 @@ class Dn implements \ArrayAccess
*
* Escapes the given VALUES according to RFC 2253 so that they can be safely used in LDAP DNs.
* The characters ",", "+", """, "\", "<", ">", ";", "#", " = " with a special meaning in RFC 2252
- * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair.
+ * are preceded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair.
* Finally all leading and trailing spaces are converted to sequences of \20.
* @see Net_LDAP2_Util::escape_dn_value() from Benedikt Hallinger <beni@php.net>
* @link http://pear.php.net/package/Net_LDAP2
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
index 74c73338e78770ef5164fc7ff81ee8837256b23b..6deafa831915fab468ce8aa5f5f304ebf460fe45 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
@@ -347,7 +347,7 @@ class Ldap
}
/**
- * @return integer Either ACCTNAME_FORM_BACKSLASH, ACCTNAME_FORM_PRINCIPAL or
+ * @return int Either ACCTNAME_FORM_BACKSLASH, ACCTNAME_FORM_PRINCIPAL or
* ACCTNAME_FORM_USERNAME indicating the form usernames should be canonicalized to.
*/
protected function getAccountCanonicalForm()
@@ -852,12 +852,12 @@ class Ldap
*
* @param string|Filter\AbstractFilter|array $filter
* @param string|Dn|null $basedn
- * @param integer $scope
+ * @param int $scope
* @param array $attributes
* @param string|null $sort
* @param string|null $collectionClass
- * @param integer $sizelimit
- * @param integer $timelimit
+ * @param int $sizelimit
+ * @param int $timelimit
* @return Collection
* @throws Exception\LdapException
*/
@@ -966,8 +966,8 @@ class Ldap
*
* @param string|Filter\AbstractFilter $filter
* @param string|Dn|null $basedn
- * @param integer $scope
- * @return integer
+ * @param int $scope
+ * @return int
* @throws Exception\LdapException
*/
public function count($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB)
@@ -988,7 +988,7 @@ class Ldap
* Count children for a given DN.
*
* @param string|Dn $dn
- * @return integer
+ * @return int
* @throws Exception\LdapException
*/
public function countChildren($dn)
@@ -1024,12 +1024,12 @@ class Ldap
*
* @param string|Filter\AbstractFilter|array $filter
* @param string|Dn|null $basedn
- * @param integer $scope
+ * @param int $scope
* @param array $attributes
* @param string|null $sort
* @param bool $reverseSort
- * @param integer $sizelimit
- * @param integer $timelimit
+ * @param int $sizelimit
+ * @param int $timelimit
* @return array
* @throws Exception\LdapException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php
index d484a91b3abf5dcdea95d21d59fc1e7aeea1b91f..ea08fb35d77e05d563419bd884f6659d7652dc12 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php
@@ -65,14 +65,17 @@ class Encoder
$items = array();
$item = array();
$last = null;
+ $inComment = false;
foreach (explode("\n", $string) as $line) {
$line = rtrim($line, "\x09\x0A\x0D\x00\x0B");
$matches = array();
- if (substr($line, 0, 1) === ' ' && $last !== null) {
+ if (substr($line, 0, 1) === ' ' && $last !== null && !$inComment) {
$last[2] .= substr($line, 1);
} elseif (substr($line, 0, 1) === '#') {
+ $inComment = true;
continue;
- } elseif (preg_match('/^([a-z0-9;-]+)(:[:<]?\s*)([^:<]*)$/i', $line, $matches)) {
+ } elseif (preg_match('/^([a-z0-9;-]+)(:[:<]?\s*)([^<]*)$/i', $line, $matches)) {
+ $inComment = false;
$name = strtolower($matches[1]);
$type = trim($matches[2]);
$value = $matches[3];
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
index e351cdd92477b143cadba45bbbd2e6c0cb3559da..fd433e00be8bea55f900ead9ac737d23a5fb2243 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
@@ -691,7 +691,7 @@ class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
* This is an offline method.
*
* @param string $name
- * @param integer|array $value
+ * @param int|array $value
* @param bool $utc
* @return Node Provides a fluid interface
* @throws Exception\LdapException
@@ -708,7 +708,7 @@ class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
* This is an offline method.
*
* @param string $name
- * @param integer|array $value
+ * @param int|array $value
* @param bool $utc
* @return Node Provides a fluid interface
* @throws Exception\LdapException
@@ -724,7 +724,7 @@ class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
* Checks if the attribute can be set and sets it accordingly.
*
* @param string $name
- * @param integer|array $value
+ * @param int|array $value
* @param bool $utc
* @param bool $append
* @throws Exception\LdapException
@@ -920,7 +920,7 @@ class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
* This is an online method.
*
* @param string|Filter\AbstractFilter $filter
- * @param integer $scope
+ * @param int $scope
* @param string $sort
* @return Node\Collection
* @throws Exception\LdapException
@@ -939,8 +939,8 @@ class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
* This is an online method.
*
* @param string|Filter\AbstractFilter $filter
- * @param integer $scope
- * @return integer
+ * @param int $scope
+ * @return int
* @throws Exception\LdapException
*/
public function countSubtree($filter, $scope = Ldap::SEARCH_SCOPE_SUB)
@@ -953,7 +953,7 @@ class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
*
* This is an online method.
*
- * @return integer
+ * @return int
* @throws Exception\LdapException
*/
public function countChildren()
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
index 2581b491dc02ed58c2346acd4732acbe96da9397..f92042c6fddeac73a006a27bdca82f62084e046b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
@@ -304,7 +304,7 @@ abstract class AbstractNode implements \ArrayAccess, \Countable
* This is an offline method.
*
* @param string $name
- * @param integer $index
+ * @param int $index
* @return mixed
* @throws \Zend\Ldap\Exception\LdapException
*/
@@ -323,8 +323,8 @@ abstract class AbstractNode implements \ArrayAccess, \Countable
* This is an offline method.
*
* @param string $name
- * @param integer $index
- * @return array|integer
+ * @param int $index
+ * @return array|int
* @throws \Zend\Ldap\Exception\LdapException
*/
public function getDateTimeAttribute($name, $index = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
index 687719661b0674719c2686fa6a91cfe53357925d..a2cd5f5b9c216a4fdf9f783bc48721e23ef79e9d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
@@ -70,7 +70,7 @@ class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterfac
/**
* Gets the objectClass type
*
- * @return integer
+ * @return int
*/
public function getType()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
index f23427e4837deb1c35a07b6f917cf8e3c9ef5914..ed354d9e2264c6b2354098a4eacaf643b0c38eb4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
@@ -52,7 +52,7 @@ interface ObjectClassInterface
/**
* Gets the objectClass type
*
- * @return integer
+ * @return int
*/
public function getType();
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
index 5f5d5535d1df5d016545044cc617876c973c6bc1..0b155a86cd13a8a93321776312a275ed971b87f1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
@@ -113,7 +113,7 @@ class OpenLdap extends Schema\AbstractItem implements ObjectClassInterface
/**
* Gets the objectClass type
*
- * @return integer
+ * @return int
*/
public function getType()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json b/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json
index d9c838f60556a7b74d62da102a70b591ebe40be1..c1cff48df564cf15f948f04d08404f177d713967 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php
index d6f476996fbf5e3e63ecf367229655d7d97e30d1..77c82148152735db9eefdc77db43eb0a88eb543c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php
@@ -201,7 +201,7 @@ class ClassMapAutoloader implements SplAutoloader
return;
}
- $parts = explode('/', str_replace(array('/','\\'), '/', substr($path, 8)));
+ $parts = explode('/', str_replace(array('/', '\\'), '/', substr($path, 8)));
$parts = array_values(array_filter($parts, function ($p) {
return ($p !== '' && $p !== '.');
}));
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php
index 1c691a5e45603e5bdb92619baaa96d3c33a87648..053770e137b573213e3a5521e3b448b99b6edf6b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php
@@ -153,9 +153,9 @@ class ModuleAutoloader implements SplAutoloader
}
}
- if (count($this->namespacedPaths) >= 1 ) {
- foreach ( $this->namespacedPaths as $namespace=>$path ) {
- if ( false === strpos($moduleName,$namespace) ) {
+ if (count($this->namespacedPaths) >= 1) {
+ foreach ($this->namespacedPaths as $namespace => $path) {
+ if (false === strpos($moduleName, $namespace)) {
continue;
}
@@ -359,8 +359,8 @@ class ModuleAutoloader implements SplAutoloader
));
}
if ($moduleName) {
- if (in_array( substr($moduleName, -2 ), array('\\*','\\%') ) ) {
- $this->namespacedPaths[ substr($moduleName, 0, -2 ) ] = static::normalizePath($path);
+ if (in_array( substr($moduleName, -2), array('\\*', '\\%'))) {
+ $this->namespacedPaths[substr($moduleName, 0, -2)] = static::normalizePath($path);
} else {
$this->explicitPaths[$moduleName] = static::normalizePath($path);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/composer.json b/vendor/zendframework/zendframework/library/Zend/Loader/composer.json
index c7bd13ac7ca0d211610f3d9cb39cefb2f9516859..7844ff4d2007f1e8a205077ef177b0860af8dfb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
index 2077be3eaf615bb125b2fe3d182dd11b115d2d85..fb22b3d80b6951095f1d58bbd8b91120356bd6eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
@@ -85,7 +85,7 @@ class Base implements FormatterInterface
$value[$key] = $this->normalize($subvalue);
}
$value = json_encode($value);
- } elseif (is_object($value) && !method_exists($value,'__toString')) {
+ } elseif (is_object($value) && !method_exists($value, '__toString')) {
$value = sprintf('object(%s) %s', get_class($value), json_encode($value));
} elseif (is_resource($value)) {
$value = sprintf('resource(%s)', get_resource_type($value));
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php
index 3ec5bccb23d5398218b21f5bd97667c57350cb4e..1e21b8973e60826ca71462119974b6ea791c9405 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php
@@ -20,7 +20,7 @@ class FirePhp implements FormatterInterface
public function format($event)
{
$label = null;
- if ( !empty($event['extra']) ) {
+ if (!empty($event['extra'])) {
$line = $event['extra'];
$label = $event['message'];
} else {
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php
index b0b533166716a2d5c64599bceea9c6b0739d9582..5d3570637cf180af07cd7e871dc23a549ea1aa0b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php
@@ -177,7 +177,7 @@ class Xml implements FormatterInterface
foreach ($dataToInsert as $key => $value) {
if (empty($value)
|| is_scalar($value)
- || (is_object($value) && method_exists($value,'__toString'))
+ || (is_object($value) && method_exists($value, '__toString'))
) {
if ($key == "message") {
$value = $escaper->escapeHtml($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..ccb4c6489da8dff9f0794897cfeb114e83f010c8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Log;
+
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Logger abstract service factory.
+ *
+ * Allow to configure multiple loggers for application.
+ */
+class LoggerAbstractServiceFactory implements AbstractFactoryInterface
+{
+ /**
+ * @var array
+ */
+ protected $config;
+
+ /**
+ * Configuration key holding logger configuration
+ *
+ * @var string
+ */
+ protected $configKey = 'log';
+
+ /**
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return bool
+ */
+ public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $config = $this->getConfig($services);
+ if (empty($config)) {
+ return false;
+ }
+
+ return isset($config[$requestedName]);
+ }
+
+ /**
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return Logger
+ */
+ public function createServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $config = $this->getConfig($services);
+ return new Logger($config[$requestedName]);
+ }
+
+ /**
+ * Retrieve configuration for loggers, if any
+ *
+ * @param ServiceLocatorInterface $services
+ * @return array
+ */
+ protected function getConfig(ServiceLocatorInterface $services)
+ {
+ if ($this->config !== null) {
+ return $this->config;
+ }
+
+ if (!$services->has('Config')) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $config = $services->get('Config');
+ if (!isset($config[$this->configKey])) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $this->config = $config[$this->configKey];
+ return $this->config;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php
index f2583a1589aa724f49ff27b80c1fa977884c997f..49630ba201084367a68bd18d374297d857d9a073 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php
@@ -100,7 +100,7 @@ abstract class AbstractWriter implements WriterInterface
$formatter = $options['formatter'];
if (is_string($formatter) || $formatter instanceof Formatter\FormatterInterface) {
$this->setFormatter($formatter);
- } else if(is_array($formatter)) {
+ } elseif (is_array($formatter)) {
if (!isset($formatter['name'])) {
throw new Exception\InvalidArgumentException('Options must contain a name for the formatter');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php
index f3e17448591a68c28ba49989ffa8bf29fab9bdd5..1340b27575cfaf49dfff3285993bbb04245058c2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php
@@ -75,7 +75,7 @@ class Db extends AbstractWriter
}
$tableName = (string) $tableName;
- if ('' === $tableName){
+ if ('' === $tableName) {
throw new Exception\InvalidArgumentException('You must specify a table name. Either directly in the constructor, or via options');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php
index bb41b6f1c785159ac46808b949e0f2b7651e8542..4bb59c922958107ef38e476f99168a60867013c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php
@@ -9,9 +9,9 @@
namespace Zend\Log\Writer;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\Log\Filter;
use Zend\Log\Exception;
+use Zend\Log\Filter;
+use Zend\ServiceManager\AbstractPluginManager;
class FilterPluginManager extends AbstractPluginManager
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php
index f8df0672444a925fb621a8461402ffcf09e17a6f..270fa451fde9a77b49e3447bbb2089cb4bc055a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php
@@ -10,13 +10,13 @@ namespace Zend\Log\Writer;
use Traversable;
use Zend\Stdlib\ArrayUtils;
-use Zend\Log\Filter\Priority as PriorityFilter;
+use Zend\Log\Exception;
use Zend\Log\Filter\FilterInterface;
+use Zend\Log\Filter\Priority as PriorityFilter;
use Zend\Log\Formatter\FormatterInterface;
-use Zend\Log\Exception;
use Zend\Log\Logger;
-use Zend\Log\Writer\WriterInterface;
use Zend\Log\Writer\AbstractWriter;
+use Zend\Log\Writer\WriterInterface;
use Zend\Log\WriterPluginManager;
/**
@@ -44,7 +44,7 @@ class FingersCrossed extends AbstractWriter
/**
* Flag if buffering is enabled
*
- * @var boolean
+ * @var bool
*/
protected $buffering = true;
@@ -189,7 +189,7 @@ class FingersCrossed extends AbstractWriter
* Check if buffered data should be flushed
*
* @param array $event event data
- * @return boolean true if buffered data should be flushed
+ * @return bool true if buffered data should be flushed
*/
protected function isActivated(array $event)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php
index cf4f2e98cf4d5fab84569858c1fb96496e7da973..8539420f64f954d1e457b656db0558f9885314c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php
@@ -11,9 +11,9 @@ namespace Zend\Log\Writer;
use Traversable;
use FirePHP as FirePHPService;
+use Zend\Log\Exception;
use Zend\Log\Formatter\FirePhp as FirePhpFormatter;
use Zend\Log\Logger;
-use Zend\Log\Exception;
use FirePhp\FirePhpInterface;
class FirePhp extends AbstractWriter
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php
index 4d2ec2638ccd717e6515f7ca223cb9d311bbbec0..3abc4487260291078a1f67636f58fd058c22b54b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php
@@ -9,9 +9,9 @@
namespace Zend\Log\Writer;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\Log\Formatter;
use Zend\Log\Exception;
+use Zend\Log\Formatter;
+use Zend\ServiceManager\AbstractPluginManager;
class FormatterPluginManager extends AbstractPluginManager
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
index e8133316f8739a3666eaa1d2e18bbe5f8cb465fb..51f50c3c90926441591b94c590e23b3ab86c3026 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
@@ -11,8 +11,8 @@ namespace Zend\Log\Writer;
use Traversable;
use Zend\Log\Exception;
-use Zend\Log\Logger;
use Zend\Log\Formatter\Simple as SimpleFormatter;
+use Zend\Log\Logger;
/**
* Writes log messages to syslog
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/composer.json b/vendor/zendframework/zendframework/library/Zend/Log/composer.json
index 5dfe65b8626c4b8e355bde49a84f5b543c6b08ed..962f559d92a1da5ae8bcfb99dcf8380a20b8e10a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Log/composer.json
@@ -15,6 +15,7 @@
"target-dir": "Zend/Log",
"require": {
"php": ">=5.3.3",
+ "zendframework/zend-servicemanager": "self.version",
"zendframework/zend-stdlib": "self.version"
},
"suggest": {
@@ -26,8 +27,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php
index 82b5f92a6dff511a35228bbec28aea0b911bd2b6..4dd1be32e8b14159340754d21b3e667b871d7bec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php
@@ -41,7 +41,7 @@ class Sender implements HeaderInterface
}
// Check for address, and set if found
- if (preg_match('^(?P<name>.*?)<(?P<email>[^>]+)>$', $value, $matches)) {
+ if (preg_match('/^(?P<name>.*?)<(?P<email>[^>]+)>$/', $value, $matches)) {
$name = $matches['name'];
if (empty($name)) {
$name = null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
index 308536f4e746f7e0ae21b8c8aab61c4e21255d0b..478d639662f7cd738885cef472537322d987ec98 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
@@ -31,7 +31,7 @@ abstract class AbstractProtocol
/**
* Maximum of the transaction log
- * @var integer
+ * @var int
*/
protected $maximumLog = 64;
@@ -45,7 +45,7 @@ abstract class AbstractProtocol
/**
* Port number of connection
- * @var integer
+ * @var int
*/
protected $port;
@@ -89,7 +89,7 @@ abstract class AbstractProtocol
* Constructor.
*
* @param string $host OPTIONAL Hostname of remote connection (default: 127.0.0.1)
- * @param integer $port OPTIONAL Port number (default: null)
+ * @param int $port OPTIONAL Port number (default: null)
* @throws Exception\RuntimeException
*/
public function __construct($host = '127.0.0.1', $port = null)
@@ -118,7 +118,7 @@ abstract class AbstractProtocol
/**
* Set the maximum log size
*
- * @param integer $maximumLog Maximum log size
+ * @param int $maximumLog Maximum log size
*/
public function setMaximumLog($maximumLog)
{
@@ -250,7 +250,7 @@ abstract class AbstractProtocol
*
* @param string $request
* @throws Exception\RuntimeException
- * @return integer|bool Number of bytes written to remote host
+ * @return int|bool Number of bytes written to remote host
*/
protected function _send($request)
{
@@ -276,7 +276,7 @@ abstract class AbstractProtocol
/**
* Get a line from the stream.
*
- * @param integer $timeout Per-request timeout value if applicable
+ * @param int $timeout Per-request timeout value if applicable
* @throws Exception\RuntimeException
* @return string
*/
@@ -319,7 +319,7 @@ abstract class AbstractProtocol
* Throws a Zend_Mail_Protocol_Exception if an unexpected code is returned.
*
* @param string|array $code One or more codes that indicate a successful response
- * @param integer $timeout Per-request timeout value if applicable
+ * @param int $timeout Per-request timeout value if applicable
* @throws Exception\RuntimeException
* @return string Last line of response string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php
index d22fc6f40465ed9a5684f730655065d28e967287..0b4e8970fc6c678c51b755ca5d3bca7c784c734f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php
@@ -245,6 +245,7 @@ class Pop3
if ($tryApop && $this->timestamp) {
try {
$this->request("APOP $user " . md5($this->timestamp . $password));
+ return;
} catch (Exception\ExceptionInterface $e) {
// ignore
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
index fa1d55816d42c2ecbca1650600bf6281947e0153..28c8cd6844f2d9397c2f54f4a269f2b982b75ae4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
@@ -80,7 +80,7 @@ class Smtp extends AbstractProtocol
* are present.
*
* @param string|array $host
- * @param null|integer $port
+ * @param null|int $port
* @param null|array $config
* @throws Exception\InvalidArgumentException
*/
@@ -196,7 +196,7 @@ class Smtp extends AbstractProtocol
/**
* Returns the perceived session status
*
- * @return boolean
+ * @return bool
*/
public function hasSession()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php
index c79dc33225bc879d78cadc3b4d1d1c13d89b1ae1..5da0c19e814b9c1fc287f2a68fd0ea20f7680138 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php
@@ -205,7 +205,7 @@ abstract class AbstractStorage implements
* ArrayAccess::offsetExists()
*
* @param int $id
- * @return boolean
+ * @return bool
*/
public function offsetExists($id)
{
@@ -248,7 +248,7 @@ abstract class AbstractStorage implements
* ArrayAccess::offsetUnset()
*
* @param int $id
- * @return boolean success
+ * @return bool success
*/
public function offsetUnset($id)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php
index 715cfc565cd009445097d09d38e6faf6a560d014..a28585553d520ebb41277b6c3a7d6556ef7f01f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php
@@ -193,7 +193,7 @@ class Maildir extends Storage\Maildir implements FolderInterface
throw new Exception\RuntimeException("{$this->currentFolder} is not selectable", 0, $e);
}
// seems like file has vanished; rebuilding folder tree - but it's still an exception
- $this->_buildFolderTree($this->rootdir);
+ $this->_buildFolderTree();
throw new Exception\RuntimeException('seems like the maildir has vanished, I\'ve rebuild the ' .
'folder tree, search for an other folder and try again', 0, $e);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/composer.json b/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
index 326bf6e0487156071fea7e0b7e078f219d2adc5b..ec390bae252c883e415739744de1ae6442631295 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
@@ -24,8 +24,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
index e14eca6855e5c0c720d238ae47ef47f7b227930b..1906263ed21214a5c0e895d78c7e757362909c85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
@@ -20,7 +20,7 @@ interface AdapterInterface
* Create adapter-specific representation of a big integer
*
* @param string $operand
- * @param integer|null $base
+ * @param int|null $base
* @return mixed
*/
public function init($operand, $base = null);
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php
index e226febc68e9760d4ff676913f93855e0d150403..e18a5356911e792b573bbb778b2f58900c35454f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php
@@ -307,7 +307,7 @@ class Bcmath implements AdapterInterface
$chars = self::BASE62_ALPHABET;
// convert to decimal
- if ($fromBase == 10 ) {
+ if ($fromBase == 10) {
$decimal = $operand;
} else {
$decimal = '0';
@@ -318,7 +318,7 @@ class Bcmath implements AdapterInterface
}
if ($toBase == 10) {
- return $decimal;
+ return $decimal;
}
// convert decimal to base
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php
index fb92f2e048369d954840dd5ed0a97758205e702e..d866da89fb84002f220f444501ab9e4e9891b7b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php
@@ -20,7 +20,7 @@ class Gmp implements AdapterInterface
* Create string representing big integer in decimal form from arbitrary integer format
*
* @param string $operand
- * @param integer|null $base
+ * @param int|null $base
* @return bool|string
*/
public function init($operand, $base = null)
@@ -292,7 +292,7 @@ class Gmp implements AdapterInterface
$chars = self::BASE62_ALPHABET;
// convert operand to decimal
- if ($fromBase !== 10 ) {
+ if ($fromBase !== 10) {
$decimal = '0';
for ($i = 0, $len = strlen($operand); $i < $len; $i++) {
$decimal = gmp_mul($decimal, $fromBase);
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Rand.php b/vendor/zendframework/zendframework/library/Zend/Math/Rand.php
index ac6fa163b66fc97030cbe3359c6f928865d0e85b..616aa5b7af6388f74c912d04e98db23586964c51 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Rand.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/Rand.php
@@ -27,7 +27,7 @@ abstract class Rand
/**
* Generate random bytes using OpenSSL or Mcrypt and mt_rand() as fallback
*
- * @param integer $length
+ * @param int $length
* @param bool $strong true if you need a strong random generator (cryptography)
* @return string
* @throws Exception\RuntimeException
@@ -109,10 +109,10 @@ abstract class Rand
/**
* Generate a random integer between $min and $max
*
- * @param integer $min
- * @param integer $max
+ * @param int $min
+ * @param int $max
* @param bool $strong true if you need a strong random generator (cryptography)
- * @return integer
+ * @return int
* @throws Exception\DomainException
*/
public static function getInteger($min, $max, $strong = false)
@@ -170,7 +170,7 @@ abstract class Rand
* Uses supplied character list for generating the new string.
* If no character list provided - uses Base 64 character set.
*
- * @param integer $length
+ * @param int $length
* @param string|null $charlist
* @param bool $strong true if you need a strong random generator (cryptography)
* @return string
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/composer.json b/vendor/zendframework/zendframework/library/Zend/Math/composer.json
index 9b2896060c961097a55d67ed037d9e95b4d84c49..4af222154dd3e3b4e149094f1e290ea581f6c779 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Math/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php
index e2429521372657eef0a9ae7828261027c7b53e39..24568164f1f9b9a14efc3836401df090c9747d69 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php
@@ -22,7 +22,7 @@ class Movable extends AbstractContainer
/**
* Internal object Id
*
- * @var integer
+ * @var int
*/
protected $id;
@@ -48,7 +48,7 @@ class Movable extends AbstractContainer
/**
* Value state (LOADED/SWAPPED/LOCKED)
*
- * @var integer
+ * @var int
*/
private $state;
@@ -56,7 +56,7 @@ class Movable extends AbstractContainer
* Object constructor
*
* @param \Zend\Memory\MemoryManager $memoryManager
- * @param integer $id
+ * @param int $id
* @param string $value
*/
public function __construct(Memory\MemoryManager $memoryManager, $id, $value)
@@ -255,7 +255,7 @@ class Movable extends AbstractContainer
* Get object id
*
* @internal
- * @return integer
+ * @return int
*/
public function getId()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php b/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
index a449569a8411fb0840e1b78bd24fc037541a0aa7..8bea6cf314c04d49e759a2293e6c1c936b8d9e58 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
@@ -33,7 +33,7 @@ class MemoryManager
* Default value is 2/3 of memory_limit php.ini variable
* Negative value means no limit
*
- * @var integer
+ * @var int
*/
private $memoryLimit = -1;
@@ -42,21 +42,21 @@ class MemoryManager
* Default value is 16K
* Negative value means that memory objects are never swapped
*
- * @var integer
+ * @var int
*/
private $minSize = 16384;
/**
* Overall size of memory, used by values
*
- * @var integer
+ * @var int
*/
private $memorySize = 0;
/**
* Id for next Zend_Memory object
*
- * @var integer
+ * @var int
*/
private $nextId = 0;
@@ -100,7 +100,7 @@ class MemoryManager
/**
* Unique memory manager id
*
- * @var integer
+ * @var int
*/
private $managerId;
@@ -135,9 +135,9 @@ class MemoryManager
$this->_generateMemManagerId();
$memoryLimitStr = trim(ini_get('memory_limit'));
- if ($memoryLimitStr != '' && $memoryLimitStr != -1) {
- $this->memoryLimit = (integer)$memoryLimitStr;
- switch (strtolower($memoryLimitStr[strlen($memoryLimitStr)-1])) {
+ if ($memoryLimitStr != '' && $memoryLimitStr != -1) {
+ $this->memoryLimit = (int) $memoryLimitStr;
+ switch (strtolower($memoryLimitStr[strlen($memoryLimitStr) - 1])) {
case 'g':
$this->memoryLimit *= 1024;
// no break
@@ -174,7 +174,7 @@ class MemoryManager
/**
* Set memory grow limit
*
- * @param integer $newLimit
+ * @param int $newLimit
*/
public function setMemoryLimit($newLimit)
{
@@ -186,7 +186,7 @@ class MemoryManager
/**
* Get memory grow limit
*
- * @return integer
+ * @return int
*/
public function getMemoryLimit()
{
@@ -196,7 +196,7 @@ class MemoryManager
/**
* Set minimum size of values, which may be swapped
*
- * @param integer $newSize
+ * @param int $newSize
*/
public function setMinSize($newSize)
{
@@ -206,7 +206,7 @@ class MemoryManager
/**
* Get minimum size of values, which may be swapped
*
- * @return integer
+ * @return int
*/
public function getMinSize()
{
@@ -274,7 +274,7 @@ class MemoryManager
*
* @internal
* @param Container\Movable $container
- * @param integer $id
+ * @param int $id
* @return null
*/
public function unlink(Container\Movable $container, $id)
@@ -299,7 +299,7 @@ class MemoryManager
*
* @internal
* @param \Zend\Memory\Container\Movable $container
- * @param integer $id
+ * @param int $id
*/
public function processUpdate(Container\Movable $container, $id)
{
@@ -314,7 +314,7 @@ class MemoryManager
}
// Remove just updated object from list of candidates to unload
- if ( isset($this->unloadCandidates[$id])) {
+ if (isset($this->unloadCandidates[$id])) {
unset($this->unloadCandidates[$id]);
}
@@ -386,7 +386,7 @@ class MemoryManager
* if object is not changed since last swap
*
* @param \Zend\Memory\Container\Movable $container
- * @param integer $id
+ * @param int $id
*/
private function _swap(Container\Movable $container, $id)
{
@@ -409,7 +409,7 @@ class MemoryManager
*
* @internal
* @param \Zend\Memory\Container\Movable $container
- * @param integer $id
+ * @param int $id
*/
public function load(Container\Movable $container, $id)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Value.php b/vendor/zendframework/zendframework/library/Zend/Memory/Value.php
index 67dcb80393a3cd7a7deb3ed44f0eed1021925e6b..0c8de61496ee0a7ebec6b6e57b5e1d86d5391448 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Value.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Value.php
@@ -79,19 +79,19 @@ class Value implements ArrayAccess, Countable
* ArrayAccess interface method
* returns true if string offset exists
*
- * @param integer $offset
+ * @param int $offset
* @return bool
*/
public function offsetExists($offset)
{
- return $offset >= 0 && $offset < strlen($this->value);
+ return $offset >= 0 && $offset < strlen($this->value);
}
/**
* ArrayAccess interface method
* Get character at $offset position
*
- * @param integer $offset
+ * @param int $offset
* @return string
*/
public function offsetGet($offset)
@@ -103,7 +103,7 @@ class Value implements ArrayAccess, Countable
* ArrayAccess interface method
* Set character at $offset position
*
- * @param integer $offset
+ * @param int $offset
* @param string $char
*/
public function offsetSet($offset, $char)
@@ -120,7 +120,7 @@ class Value implements ArrayAccess, Countable
* ArrayAccess interface method
* Unset character at $offset position
*
- * @param integer $offset
+ * @param int $offset
*/
public function offsetUnset($offset)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/composer.json b/vendor/zendframework/zendframework/library/Zend/Memory/composer.json
index c430d5f9c7d3827dce0587b6fc35b0b4ff353efb..cdf7e825a61a5e7e6d72b4371a71d98aa4949865 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/composer.json
@@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/composer.json b/vendor/zendframework/zendframework/library/Zend/Mime/composer.json
index ee08a3bf7c389a114ce7c738639e2d949d1b582c..b7d0c15379cc06f404f89cf9a4e0583e2044c59c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..06418b89ee9ed843f9a7ee3a66453d330a998525
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface HydratorProviderInterface
+{
+ /**
+ * Expected to return \Zend\ServiceManager\Config object or array to
+ * seed such an object.
+ *
+ * @return array|\Zend\ServiceManager\Config
+ */
+ public function getHydratorConfig();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..2bcb5afd941d4d5371b83ed08da5b8f3fb34fb62
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface InputFilterProviderInterface
+{
+ /**
+ * Expected to return \Zend\ServiceManager\Config object or array to
+ * seed such an object.
+ *
+ * @return array|\Zend\ServiceManager\Config
+ */
+ public function getInputFilterConfig();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php
index 54e666c198e1a60984f924150a1b0f99a8b98ace..f19729b3022134e3dd6a55f1df345a581bcc06d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php
@@ -32,7 +32,7 @@ class ConfigListener extends AbstractListener implements
/**
* @var array
*/
- protected $listeners = array();
+ protected $callbacks = array();
/**
* @var array
@@ -77,22 +77,19 @@ class ConfigListener extends AbstractListener implements
}
/**
- * Attach one or more listeners
- *
- * @param EventManagerInterface $events
- * @return ConfigListener
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
- $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onloadModulesPre'), 1000);
+ $this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onloadModulesPre'), 1000);
if ($this->skipConfig) {
// We already have the config from cache, no need to collect or merge.
return $this;
}
- $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE, array($this, 'onLoadModule'));
- $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModulesPost'), -1000);
+ $this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE, array($this, 'onLoadModule'));
+ $this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModulesPost'), -1000);
return $this;
}
@@ -166,19 +163,15 @@ class ConfigListener extends AbstractListener implements
}
/**
- * Detach all previously attached listeners
- *
- * @param EventManagerInterface $events
- * @return ConfigListener
+ * {@inheritDoc}
*/
public function detach(EventManagerInterface $events)
{
- foreach ($this->listeners as $key => $listener) {
- $events->detach($listener);
- unset($this->listeners[$key]);
+ foreach ($this->callbacks as $index => $callback) {
+ if ($events->detach($callback)) {
+ unset($this->callbacks[$index]);
+ }
}
- $this->listeners = array();
- return $this;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
index cef16df7a433a3848730a2d6f47a6c7b75d78507..178793cd1296a2affbc1d8f92b8eb2b4b3b09462 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
@@ -30,7 +30,7 @@ class LocatorRegistrationListener extends AbstractListener implements
/**
* @var array
*/
- protected $listeners = array();
+ protected $callbacks = array();
/**
* loadModule
@@ -109,29 +109,23 @@ class LocatorRegistrationListener extends AbstractListener implements
}
/**
- * Attach one or more listeners
- *
- * @param EventManagerInterface $events
- * @return LocatorRegistrationListener
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
- $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE, array($this, 'onLoadModule'));
- $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModules'), -1000);
+ $this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE, array($this, 'onLoadModule'));
+ $this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModules'), -1000);
return $this;
}
/**
- * Detach all previously attached listeners
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function detach(EventManagerInterface $events)
{
- foreach ($this->listeners as $key => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$key]);
+ foreach ($this->callbacks as $index => $callback) {
+ if ($events->detach($callback)) {
+ unset($this->callbacks[$index]);
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
index f261fa145f591edd7a98a9a6d5e6f7c92bcefa7e..7d81df55b32d238f23dbc94712d1df7accec4eaf 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
@@ -9,10 +9,10 @@
namespace Zend\ModuleManager\Listener;
-use Zend\Loader\ModuleAutoloader;
-use Zend\ModuleManager\ModuleEvent;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
+use Zend\Loader\ModuleAutoloader;
+use Zend\ModuleManager\ModuleEvent;
/**
* Module loader listener
@@ -32,7 +32,7 @@ class ModuleLoaderListener extends AbstractListener implements ListenerAggregate
/**
* @var array
*/
- protected $listeners = array();
+ protected $callbacks = array();
/**
* Constructor.
@@ -56,40 +56,32 @@ class ModuleLoaderListener extends AbstractListener implements ListenerAggregate
}
/**
- * Attach one or more listeners
- *
- * @param EventManagerInterface $events
- * @return LocatorRegistrationListener
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
- $this->listeners[] = $events->attach(
+ $this->callbacks[] = $events->attach(
ModuleEvent::EVENT_LOAD_MODULES,
array($this->moduleLoader, 'register'),
9000
);
if ($this->generateCache) {
- $this->listeners[] = $events->attach(
+ $this->callbacks[] = $events->attach(
ModuleEvent::EVENT_LOAD_MODULES_POST,
array($this, 'onLoadModulesPost')
);
}
-
- return $this;
}
/**
- * Detach all previously attached listeners
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function detach(EventManagerInterface $events)
{
- foreach ($this->listeners as $key => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$key]);
+ foreach ($this->callbacks as $index => $callback) {
+ if ($events->detach($callback)) {
+ unset($this->callbacks[$index]);
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php
index 6f68f5e146d52a3747525fc92296771973a52741..20b79892f1be68da586044f940a1ef4c46129986 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php
@@ -77,8 +77,17 @@ class ModuleManager implements ModuleManagerInterface
return $this;
}
- foreach ($this->getModules() as $moduleName) {
- $this->loadModule($moduleName);
+ foreach ($this->getModules() as $moduleName => $module) {
+ if (is_object($module)) {
+ if (!is_string($moduleName)) {
+ throw new Exception\RuntimeException(sprintf(
+ 'Module (%s) must have a key identifier.',
+ get_class($module)
+ ));
+ }
+ $module = array($moduleName => $module);
+ }
+ $this->loadModule($module);
}
$this->modulesAreLoaded = true;
@@ -113,14 +122,20 @@ class ModuleManager implements ModuleManagerInterface
/**
* Load a specific module by name.
*
- * @param string $moduleName
- * @throws Exception\RuntimeException
+ * @param string|array $module
+ * @throws Exception\RuntimeException
* @triggers loadModule.resolve
* @triggers loadModule
- * @return mixed Module's Module class
+ * @return mixed Module's Module class
*/
- public function loadModule($moduleName)
+ public function loadModule($module)
{
+ $moduleName = $module;
+ if (is_array($module)) {
+ $moduleName = key($module);
+ $module = current($module);
+ }
+
if (isset($this->loadedModules[$moduleName])) {
return $this->loadedModules[$moduleName];
}
@@ -130,24 +145,38 @@ class ModuleManager implements ModuleManagerInterface
$this->loadFinished = false;
+ if (!is_object($module)) {
+ $module = $this->loadModuleByName($event);
+ }
+ $event->setModule($module);
+
+ $this->loadedModules[$moduleName] = $module;
+ $this->getEventManager()->trigger(ModuleEvent::EVENT_LOAD_MODULE, $this, $event);
+
+ $this->loadFinished = true;
+
+ return $module;
+ }
+
+ /**
+ * Load a module with the name
+ * @param Zend\EventManager\EventInterface $event
+ * @return mixed module instance
+ * @throws Exception\RuntimeException
+ */
+ protected function loadModuleByName($event)
+ {
$result = $this->getEventManager()->trigger(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, $this, $event, function ($r) {
return (is_object($r));
});
$module = $result->last();
-
if (!is_object($module)) {
throw new Exception\RuntimeException(sprintf(
'Module (%s) could not be initialized.',
- $moduleName
+ $event->getModuleName()
));
}
- $event->setModule($module);
-
- $this->loadedModules[$moduleName] = $module;
- $this->getEventManager()->trigger(ModuleEvent::EVENT_LOAD_MODULE, $this, $event);
-
- $this->loadFinished = true;
return $module;
}
@@ -155,7 +184,7 @@ class ModuleManager implements ModuleManagerInterface
/**
* Get an array of the loaded modules.
*
- * @param bool $loadModules If true, load modules if they're not already
+ * @param bool $loadModules If true, load modules if they're not already
* @return array An array of Module objects, keyed by module name
*/
public function getLoadedModules($loadModules = false)
@@ -163,6 +192,7 @@ class ModuleManager implements ModuleManagerInterface
if (true === $loadModules) {
$this->loadModules();
}
+
return $this->loadedModules;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json b/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json
index 6c6236cf4fb2dbaba87ed4f2746ace93f7ac21ea..40ad41ab7cbd90f8a9b27914e2a3007a3e6421a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json
@@ -24,8 +24,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php
index 80cdf3d3d0b9a3140e944f360df082e9ff37d687..093a299b7b72018d7bf21183730afb85ab387f8d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php
@@ -58,6 +58,18 @@ class Application implements
*/
protected $configuration = null;
+ /**
+ * Default application event listeners
+ *
+ * @var array
+ */
+ protected $defaultListeners = array(
+ 'RouteListener',
+ 'DispatchListener',
+ 'ViewManager',
+ 'SendResponseListener',
+ );
+
/**
* MVC event token
* @var MvcEvent
@@ -118,17 +130,19 @@ class Application implements
* router. Attaches the ViewManager as a listener. Triggers the bootstrap
* event.
*
+ * @param array $listeners List of listeners to attach.
* @return Application
*/
- public function bootstrap()
+ public function bootstrap(array $listeners = array())
{
$serviceManager = $this->serviceManager;
- $events = $this->getEventManager();
+ $events = $this->events;
+
+ $listeners = array_unique(array_merge($this->defaultListeners, $listeners));
- $events->attach($serviceManager->get('RouteListener'));
- $events->attach($serviceManager->get('DispatchListener'));
- $events->attach($serviceManager->get('ViewManager'));
- $events->attach($serviceManager->get('SendResponseListener'));
+ foreach ($listeners as $listener) {
+ $events->attach($serviceManager->get($listener));
+ }
// Setup MVC Event
$this->event = $event = new MvcEvent();
@@ -233,10 +247,11 @@ class Application implements
public static function init($configuration = array())
{
$smConfig = isset($configuration['service_manager']) ? $configuration['service_manager'] : array();
+ $listeners = isset($configuration['listeners']) ? $configuration['listeners'] : array();
$serviceManager = new ServiceManager(new Service\ServiceManagerConfig($smConfig));
$serviceManager->setService('ApplicationConfig', $configuration);
$serviceManager->get('ModuleManager')->loadModules();
- return $serviceManager->get('Application')->bootstrap();
+ return $serviceManager->get('Application')->bootstrap($listeners);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
index 75ee82440a6cc44a412e985491241f1e4bdf04f3..3ae583acddfeb155ffea60ea7cc20cfa05361929 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -38,6 +38,13 @@ abstract class AbstractRestfulController extends AbstractController
)
);
+ /**
+ * Name of request or query parameter containing identifier
+ *
+ * @var string
+ */
+ protected $identifierName = 'id';
+
/**
* @var int From Zend\Json\Json
*/
@@ -50,6 +57,28 @@ abstract class AbstractRestfulController extends AbstractController
*/
protected $customHttpMethodsMap = array();
+ /**
+ * Set the route match/query parameter name containing the identifier
+ *
+ * @param string $name
+ * @return self
+ */
+ public function setIdentifierName($name)
+ {
+ $this->identifierName = (string) $name;
+ return $this;
+ }
+
+ /**
+ * Retrieve the route match/query parameter name containing the identifier
+ *
+ * @return string
+ */
+ public function getIdentifierName()
+ {
+ return $this->identifierName;
+ }
+
/**
* Create a new resource
*
@@ -139,7 +168,8 @@ abstract class AbstractRestfulController extends AbstractController
* Not marked as abstract, as that would introduce a BC break
* (introduced in 2.1.0); instead, raises an exception if not implemented.
*
- * @return mixed
+ * @param $id
+ * @param $data
* @throws Exception\RuntimeException
*/
public function patch($id, $data)
@@ -166,6 +196,23 @@ abstract class AbstractRestfulController extends AbstractController
));
}
+ /**
+ * Modify a resource collection withou completely replacing it
+ *
+ * Not marked as abstract, as that would introduce a BC break
+ * (introduced in 2.2.0); instead, raises an exception if not implemented.
+ *
+ * @param mixed $data
+ * @return mixed
+ * @throws Exception\RuntimeException
+ */
+ public function patchList($data)
+ {
+ throw new Exception\RuntimeException(sprintf(
+ '%s is unimplemented', __METHOD__
+ ));
+ }
+
/**
* Update an existing resource
*
@@ -215,6 +262,7 @@ abstract class AbstractRestfulController extends AbstractController
/**
* Handle the request
*
+ * @todo try-catch in "patch" for patchList should be removed in the future
* @param MvcEvent $e
* @return mixed
* @throws Exception\DomainException if no route matches in event or invalid HTTP method
@@ -299,14 +347,25 @@ abstract class AbstractRestfulController extends AbstractController
// PATCH
case 'patch':
$id = $this->getIdentifier($routeMatch, $request);
- if ($id === false) {
+ $data = $this->processBodyContent($request);
+
+ if ($id !== false) {
+ $action = 'patch';
+ $return = $this->patch($id, $data);
+ break;
+ }
+
+ // TODO: This try-catch should be removed in the future, but it
+ // will create a BC break for pre-2.2.0 apps that expect a 405
+ // instead of going to patchList
+ try {
+ $action = 'patchList';
+ $return = $this->patchList($data);
+ } catch (Exception\RuntimeException $ex) {
$response = $e->getResponse();
$response->setStatusCode(405);
return $response;
}
- $data = $this->processBodyContent($request);
- $action = 'patch';
- $return = $this->patch($id, $data);
break;
// POST
case 'post':
@@ -439,13 +498,14 @@ abstract class AbstractRestfulController extends AbstractController
*/
protected function getIdentifier($routeMatch, $request)
{
- $id = $routeMatch->getParam('id', false);
- if ($id) {
+ $identifier = $this->getIdentifierName();
+ $id = $routeMatch->getParam($identifier, false);
+ if ($id !== false) {
return $id;
}
- $id = $request->getQuery()->get('id', false);
- if ($id) {
+ $id = $request->getQuery()->get($identifier, false);
+ if ($id !== false) {
return $id;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php
index 563551b8e6b133d3513e3051ad364fae1463afc1..3e1d1e624864c81efb6a2bc17bfce07ccfaa7236 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php
@@ -108,7 +108,20 @@ class ControllerManager extends AbstractPluginManager
}
/**
- * Override: do not use peering service manager to retrieve controller
+ * Override: do not use peering service managers
+ *
+ * @param string|array $name
+ * @param bool $checkAbstractFactories
+ * @param bool $usePeeringServiceManagers
+ * @return bool
+ */
+ public function has($name, $checkAbstractFactories = true, $usePeeringServiceManagers = false)
+ {
+ return parent::has($name, $checkAbstractFactories, $usePeeringServiceManagers);
+ }
+
+ /**
+ * Override: do not use peering service managers
*
* @param string $name
* @param array $options
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
index 101d0521649bd88b33b2d2f3ccfbfd322f184963..1f38960bcbdd1d99005d42e84fb11e6cbefa2b0f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
@@ -9,15 +9,14 @@
namespace Zend\Mvc\Controller\Plugin;
-use Zend\Http\Request;
use Zend\Http\Header\Accept\FieldValuePart\AbstractFieldValuePart;
+use Zend\Http\Request;
use Zend\Mvc\Controller\Plugin\AbstractPlugin;
-use Zend\View\Model\ModelInterface;
use Zend\Mvc\InjectApplicationEventInterface;
use Zend\Mvc\MvcEvent;
-use Zend\Mvc\Exception\InvalidArgumentException;
use Zend\Mvc\Exception\DomainException;
-
+use Zend\Mvc\Exception\InvalidArgumentException;
+use Zend\View\Model\ModelInterface;
/**
* Controller Plugin to assist in selecting an appropriate View Model type based on the
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
index 10ea5f1233375750b6c942c04320f99bca8c87a3..d23955ae25bd251ec0511b0db2c8e83d4a405f30 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
@@ -246,7 +246,8 @@ class FilePostRedirectGet extends AbstractPlugin
$messages = $input->getMessages();
if (is_array($value) && $input instanceof FileInput && empty($messages)) {
$rawValue = $input->getRawValue();
- if ( (isset($rawValue['error']) && $rawValue['error'] !== UPLOAD_ERR_NO_FILE)
+ if (
+ (isset($rawValue['error']) && $rawValue['error'] !== UPLOAD_ERR_NO_FILE)
|| (isset($rawValue[0]['error']) && $rawValue[0]['error'] !== UPLOAD_ERR_NO_FILE)
) {
return $value;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
index c1058813e808f0e8c329c06c4c780fb9c55e95f8..f340f91333f64a03cc878b335a002cdccc0f40aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
@@ -155,7 +155,7 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
if (!$this->messageAdded) {
$this->getMessagesFromContainer();
- $container->setExpirationHops(1, null, true);
+ $container->setExpirationHops(1, null);
}
if (!isset($container->{$namespace})
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php
index e373d504917492d87efe79436c2768441175b622..4f48cf2c77af9d624108ae5bfe2c40ab03e6db5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php
@@ -10,25 +10,23 @@
namespace Zend\Mvc\Controller\Plugin;
use Zend\EventManager\SharedEventManagerInterface as SharedEvents;
+use Zend\Mvc\Controller\ControllerManager;
use Zend\Mvc\Exception;
use Zend\Mvc\InjectApplicationEventInterface;
use Zend\Mvc\MvcEvent;
use Zend\Mvc\Router\RouteMatch;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Stdlib\DispatchableInterface as Dispatchable;
class Forward extends AbstractPlugin
{
/**
- * @var MvcEvent
+ * @var ControllerManager
*/
- protected $event;
+ protected $controllers;
/**
- * @var ServiceLocatorInterface
+ * @var MvcEvent
*/
- protected $locator;
+ protected $event;
/**
* @var int
@@ -45,6 +43,14 @@ class Forward extends AbstractPlugin
*/
protected $listenersToDetach = null;
+ /**
+ * @param ControllerManager $controllers
+ */
+ public function __construct(ControllerManager $controllers)
+ {
+ $this->controllers = $controllers;
+ }
+
/**
* Set maximum number of nested forwards allowed
*
@@ -98,7 +104,7 @@ class Forward extends AbstractPlugin
/**
* Dispatch another controller
*
- * @param string $name Controller name; either a class name or an alias used in the DI container or service locator
+ * @param string $name Controller name; either a class name or an alias used in the controller manager
* @param null|array $params Parameters with which to seed a custom RouteMatch object for the new controller
* @return mixed
* @throws Exception\DomainException if composed controller does not define InjectApplicationEventInterface
@@ -107,28 +113,11 @@ class Forward extends AbstractPlugin
public function dispatch($name, array $params = null)
{
$event = clone($this->getEvent());
- $locator = $this->getLocator();
- $scoped = false;
-
- // Use the controller loader when possible
- if ($locator->has('ControllerLoader')) {
- $locator = $locator->get('ControllerLoader');
- $scoped = true;
- }
- $controller = $locator->get($name);
- if (!$controller instanceof Dispatchable) {
- throw new Exception\DomainException('Can only forward to DispatchableInterface classes; class of type ' . get_class($controller) . ' received');
- }
+ $controller = $this->controllers->get($name);
if ($controller instanceof InjectApplicationEventInterface) {
$controller->setEvent($event);
}
- if (!$scoped) {
- if ($controller instanceof ServiceLocatorAwareInterface) {
- $controller->setServiceLocator($locator);
- }
- }
-
// Allow passing parameters to seed the RouteMatch with & copy matched route name
if ($params !== null) {
@@ -137,7 +126,6 @@ class Forward extends AbstractPlugin
$event->setRouteMatch($routeMatch);
}
-
if ($this->numNestedForwards > $this->maxNestedForwards) {
throw new Exception\DomainException("Circular forwarding detected: greater than $this->maxNestedForwards nested forwards");
}
@@ -222,31 +210,6 @@ class Forward extends AbstractPlugin
}
}
- /**
- * Get the locator
- *
- * @return ServiceLocatorInterface
- * @throws Exception\DomainException if unable to find locator
- */
- protected function getLocator()
- {
- if ($this->locator) {
- return $this->locator;
- }
-
- $controller = $this->getController();
-
- if (!$controller instanceof ServiceLocatorAwareInterface) {
- throw new Exception\DomainException('Forward plugin requires controller implements ServiceLocatorAwareInterface');
- }
- $locator = $controller->getServiceLocator();
- if (!$locator instanceof ServiceLocatorInterface) {
- throw new Exception\DomainException('Forward plugin requires controller composes Locator');
- }
- $this->locator = $locator;
- return $this->locator;
- }
-
/**
* Get the event
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php
index c6c984a3a180dd12a1d1ab161346479ed6aa1ed8..366ed950688170d3ea48c41982dc2652dc9c82cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php
@@ -48,7 +48,7 @@ class Identity extends AbstractPlugin
*/
public function __invoke()
{
- if (!$this->authenticationService instanceof AuthenticationService){
+ if (!$this->authenticationService instanceof AuthenticationService) {
throw new Exception\RuntimeException('No AuthenticationService instance provided');
}
if (!$this->authenticationService->hasIdentity()) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php
index 885bac4b00e4853f62050d60c8dca98426edd72a..588912184bd956a1ba95f06c6d626e8c4bf3e6ed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php
@@ -33,7 +33,7 @@ class Redirect extends AbstractPlugin
* @throws Exception\DomainException if composed controller does not implement InjectApplicationEventInterface, or
* router cannot be found in controller event
*/
- public function toRoute($route = null, array $params = array(), $options = array(), $reuseMatchedParams = false)
+ public function toRoute($route = null, $params = array(), $options = array(), $reuseMatchedParams = false)
{
$controller = $this->getController();
if (!$controller || !method_exists($controller, 'plugin')) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..4d974d4c374942bb67f85f8467f03b5d06e472a3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Controller\Plugin\Service;
+
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Mvc\Controller\Plugin\Forward;
+
+class ForwardFactory implements FactoryInterface
+{
+ /**
+ * {@inheritDoc}
+ *
+ * @return Forward
+ * @throws ServiceNotCreatedException if ControllerLoader service is not found in application service locator
+ */
+ public function createService(ServiceLocatorInterface $plugins)
+ {
+ $services = $plugins->getServiceLocator();
+ if (!$services instanceof ServiceLocatorInterface) {
+ throw new ServiceNotCreatedException(sprintf(
+ '%s requires that the application service manager has been injected; none found',
+ __CLASS__
+ ));
+ }
+
+ if (!$services->has('ControllerLoader')) {
+ throw new ServiceNotCreatedException(sprintf(
+ '%s requires that the application service manager contains a "%s" service; none found',
+ __CLASS__,
+ 'ControllerLoader'
+ ));
+ }
+ $controllers = $services->get('ControllerLoader');
+
+ return new Forward($controllers);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..24f18260ee451bfd76245bf7495ada1c656d6398
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Controller\Plugin\Service;
+
+use Zend\Mvc\Controller\Plugin\Identity;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class IdentityFactory implements FactoryInterface
+{
+ /**
+ * {@inheritDoc}
+ *
+ * @return \Zend\Mvc\Controller\Plugin\Identity
+ */
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ $services = $serviceLocator->getServiceLocator();
+ $helper = new Identity();
+ if ($services->has('Zend\Authentication\AuthenticationService')) {
+ $helper->setAuthenticationService($services->get('Zend\Authentication\AuthenticationService'));
+ }
+ return $helper;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php
index f2660ff93f995eeaa8c846d50e2bbff553ff9ce8..49c0a407ad65118290c6f90d8ff989b2d0ce52e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php
@@ -9,6 +9,7 @@
namespace Zend\Mvc\Controller\Plugin;
+use Traversable;
use Zend\EventManager\EventInterface;
use Zend\Mvc\Exception;
use Zend\Mvc\InjectApplicationEventInterface;
@@ -21,22 +22,33 @@ class Url extends AbstractPlugin
/**
* Generates a URL based on a route
*
- * @param string $route RouteInterface name
- * @param array $params Parameters to use in url generation, if any
- * @param array|bool $options RouteInterface-specific options to use in url generation, if any. If boolean, and no fourth argument, used as $reuseMatchedParams
- * @param bool $reuseMatchedParams Whether to reuse matched parameters
+ * @param string $route RouteInterface name
+ * @param array|Traversable $params Parameters to use in url generation, if any
+ * @param array|bool $options RouteInterface-specific options to use in url generation, if any.
+ * If boolean, and no fourth argument, used as $reuseMatchedParams.
+ * @param bool $reuseMatchedParams Whether to reuse matched parameters
+ *
+ * @throws \Zend\Mvc\Exception\RuntimeException
+ * @throws \Zend\Mvc\Exception\InvalidArgumentException
+ * @throws \Zend\Mvc\Exception\DomainException
* @return string
- * @throws Exception\DomainException if composed controller does not implement InjectApplicationEventInterface, or
- * router cannot be found in controller event
- * @throws Exception\RuntimeException if no RouteMatch instance or no matched route name present
*/
- public function fromRoute($route = null, array $params = array(), $options = array(), $reuseMatchedParams = false)
+ public function fromRoute($route = null, $params = array(), $options = array(), $reuseMatchedParams = false)
{
$controller = $this->getController();
if (!$controller instanceof InjectApplicationEventInterface) {
throw new Exception\DomainException('Url plugin requires a controller that implements InjectApplicationEventInterface');
}
+ if (!is_array($params)) {
+ if (!$params instanceof Traversable) {
+ throw new Exception\InvalidArgumentException(
+ 'Params is expected to be an array or a Traversable object'
+ );
+ }
+ $params = iterator_to_array($params);
+ }
+
$event = $controller->getEvent();
$router = null;
$matches = null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
index 603cddc0e17d0c315aedcccbaf5702e25b963ffd..98896fae666c0f4b358b3ee4a71971951846775e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
@@ -22,6 +22,16 @@ use Zend\Stdlib\DispatchableInterface;
*/
class PluginManager extends AbstractPluginManager
{
+ /**
+ * Default set of plugins factories
+ *
+ * @var array
+ */
+ protected $factories = array(
+ 'forward' => 'Zend\Mvc\Controller\Plugin\Service\ForwardFactory',
+ 'identity' => 'Zend\Mvc\Controller\Plugin\Service\IdentityFactory',
+ );
+
/**
* Default set of plugins
*
@@ -31,7 +41,6 @@ class PluginManager extends AbstractPluginManager
'acceptableviewmodelselector' => 'Zend\Mvc\Controller\Plugin\AcceptableViewModelSelector',
'filepostredirectget' => 'Zend\Mvc\Controller\Plugin\FilePostRedirectGet',
'flashmessenger' => 'Zend\Mvc\Controller\Plugin\FlashMessenger',
- 'forward' => 'Zend\Mvc\Controller\Plugin\Forward',
'layout' => 'Zend\Mvc\Controller\Plugin\Layout',
'params' => 'Zend\Mvc\Controller\Plugin\Params',
'postredirectget' => 'Zend\Mvc\Controller\Plugin\PostRedirectGet',
@@ -54,30 +63,6 @@ class PluginManager extends AbstractPluginManager
*/
protected $controller;
- /**
- * Constructor
- *
- * After invoking parent constructor, add an initializer to inject the
- * attached controller, if any, to the currently requested plugin.
- *
- * @param null|ConfigInterface $configuration
- */
- public function __construct(ConfigInterface $configuration = null)
- {
- parent::__construct($configuration);
-
- $this->setFactory('identity', function ($plugins) {
- $services = $plugins->getServiceLocator();
- $plugin = new Plugin\Identity();
- if (!$services->has('Zend\Authentication\AuthenticationService')) {
- return $plugin;
- }
- $plugin->setAuthenticationService($services->get('Zend\Authentication\AuthenticationService'));
-
- return $plugin;
- });
- }
-
/**
* Retrieve a registered instance
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php
new file mode 100644
index 0000000000000000000000000000000000000000..6849e50d006cfd8fcab72a0df58c4e07cddb1028
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\I18n;
+
+use Zend\I18n\Translator\Translator as I18nTranslator;
+use Zend\Validator\Translator\TranslatorInterface as ValidatorTranslatorInterface;
+
+class Translator extends I18nTranslator implements ValidatorTranslatorInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php
index 568c12f6e64c99922cf2af78a3050f121abfaf63..8abb40629ed0d60643ca86a632a65fad7ad8a250 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php
@@ -26,7 +26,7 @@ class ModuleRouteListener implements ListenerAggregateInterface
* Attach to an event manager
*
* @param EventManagerInterface $events
- * @param integer $priority
+ * @param int $priority
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
new file mode 100644
index 0000000000000000000000000000000000000000..46d8fb4b16338add4bdd3a220c3a3623ec3213ed
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\ResponseSender;
+
+use Zend\Http\Response;
+use Zend\Mvc\ResponseSender\SendResponseEvent;
+
+class HttpResponseSender extends AbstractResponseSender
+{
+ /**
+ * Send content
+ *
+ * @param SendResponseEvent $event
+ * @return HttpResponseSender
+ */
+ public function sendContent(SendResponseEvent $event)
+ {
+ if ($event->contentSent()) {
+ return $this;
+ }
+ $response = $event->getResponse();
+ echo $response->getContent();
+ $event->setContentSent();
+ return $this;
+ }
+
+ /**
+ * Send HTTP response
+ *
+ * @param SendResponseEvent $event
+ * @return HttpResponseSender
+ */
+ public function __invoke(SendResponseEvent $event)
+ {
+ $response = $event->getResponse();
+ if (!$response instanceof Response) {
+ return $this;
+ }
+
+ $this->sendHeaders($event)
+ ->sendContent($event);
+ $event->stopPropagation(true);
+ return $this;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
index a3502236f32cc072223df0cbc70bcfa1023ddc29..fd178a5f55e6fc56743e355791afa8153441ee52 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
@@ -9,31 +9,13 @@
namespace Zend\Mvc\ResponseSender;
-use Zend\Mvc\ResponseSender\SendResponseEvent;
-use Zend\Http\Header\MultipleHeaderInterface;
use Zend\Http\PhpEnvironment\Response;
+use Zend\Mvc\ResponseSender\SendResponseEvent;
-class PhpEnvironmentResponseSender extends AbstractResponseSender
+class PhpEnvironmentResponseSender extends HttpResponseSender
{
/**
- * Send content
- *
- * @param SendResponseEvent $event
- * @return PhpEnvironmentResponseSender
- */
- public function sendContent(SendResponseEvent $event)
- {
- if ($event->contentSent()) {
- return $this;
- }
- $response = $event->getResponse();
- echo $response->getContent();
- $event->setContentSent();
- return $this;
- }
-
- /**
- * Send HTTP response
+ * Send php environment response
*
* @param SendResponseEvent $event
* @return PhpEnvironmentResponseSender
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
index fadcafb6c28d484478e330a53162223e539a806c..5fb85f4298d77f4ec2c35515fd2c2eb3ff02881a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
@@ -22,10 +22,10 @@
namespace Zend\Mvc\Router\Console;
use Traversable;
-use Zend\Stdlib\RequestInterface as Request;
-use Zend\Mvc\Router\Exception;
use Zend\Console\Request as ConsoleRequest;
use Zend\Filter\FilterChain;
+use Zend\Mvc\Router\Exception;
+use Zend\Stdlib\RequestInterface as Request;
use Zend\Validator\ValidatorChain;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
index 9791743a7f00481abb4f742c258ea55624cdf4b3..4d5619b44143eafd97a771f60b09ce4e5f390591 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
@@ -34,7 +34,7 @@ class RouteMatch extends BaseRouteMatch
/**
* Length of the matched path.
*
- * @var integer
+ * @var int
*/
protected $length;
@@ -42,7 +42,7 @@ class RouteMatch extends BaseRouteMatch
* Create a part RouteMatch with given parameters and length.
*
* @param array $params
- * @param integer $length
+ * @param int $length
*/
public function __construct(array $params, $length = 0)
{
@@ -88,7 +88,7 @@ class RouteMatch extends BaseRouteMatch
/**
* Get the matched path length.
*
- * @return integer
+ * @return int
*/
public function getLength()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
index ffad1848b087df068e47b0ca2ae16a087ff0e3c1..7d043480a24b7e9ca8789a1ba4d0292b3bb5e257 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
@@ -22,13 +22,13 @@
namespace Zend\Mvc\Router\Console;
use Traversable;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Stdlib\RequestInterface as Request;
-use Zend\Mvc\Router\Exception;
use Zend\Console\Request as ConsoleRequest;
use Zend\Filter\FilterChain;
-use Zend\Validator\ValidatorChain;
use Zend\Mvc\Exception\InvalidArgumentException;
+use Zend\Mvc\Router\Exception;
+use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\RequestInterface as Request;
+use Zend\Validator\ValidatorChain;
/**
* Segment route.
@@ -290,7 +290,7 @@ class Simple implements RouteInterface
(?P<options>
(?:
\ *?
- (?P<name>[a-z0-9][a-zA-Z0-9_]*?)
+ (?P<name>[a-z0-9][a-zA-Z0-9_\-]*?)
\ *?
(?:\||(?=\]))
\ *?
@@ -330,7 +330,7 @@ class Simple implements RouteInterface
(?P<options>
(?:
\ *?
- (?P<name>[a-z0-9][a-zA-Z0-9_]+)
+ (?P<name>[a-z0-9][a-zA-Z0-9_\-]+)
\ *?
(?:\||(?=\)))
\ *?
@@ -447,7 +447,7 @@ class Simple implements RouteInterface
* Optional literal param, i.e.
* [something]
*/
- elseif (preg_match('/\G\[ *?(?P<name>[a-z0-9][a-zA-Z0-9\_]*?) *?\](?: +|$)/s', $def, $m, 0, $pos)) {
+ elseif (preg_match('/\G\[ *?(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?) *?\](?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
'name' => $m['name'],
'literal' => true,
@@ -460,9 +460,9 @@ class Simple implements RouteInterface
* Optional value param, i.e.
* [SOMETHING]
*/
- elseif (preg_match('/\G\[(?P<name>[A-Z0-9\_]+)\](?: +|$)/s', $def, $m, 0, $pos)) {
+ elseif (preg_match('/\G\[(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?)\](?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
- 'name' => strtolower( $m['name'] ),
+ 'name' => strtolower($m['name']),
'literal' => false,
'required' => false,
'positional' => true,
@@ -473,9 +473,9 @@ class Simple implements RouteInterface
* Optional value param, syntax 2, i.e.
* [<SOMETHING>]
*/
- elseif (preg_match('/\G\[ *\<(?P<name>[a-zA-Z0-9\_]+)\> *\](?: +|$)/s', $def, $m, 0, $pos)) {
+ elseif (preg_match('/\G\[ *\<(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?)\> *\](?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
- 'name' => strtolower( $m['name'] ),
+ 'name' => strtolower($m['name']),
'literal' => false,
'required' => false,
'positional' => true,
@@ -486,7 +486,7 @@ class Simple implements RouteInterface
* Mandatory value param, i.e.
* <something>
*/
- elseif (preg_match('/\G\< *(?P<name>[a-zA-Z0-9\_]+) *\>(?: +|$)/s', $def, $m, 0, $pos)) {
+ elseif (preg_match('/\G\< *(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?) *\>(?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
'name' => $m['name'],
'literal' => false,
@@ -499,9 +499,9 @@ class Simple implements RouteInterface
* Mandatory value param, i.e.
* SOMETHING
*/
- elseif (preg_match('/\G(?P<name>[A-Z0-9\_]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
+ elseif (preg_match('/\G(?P<name>[A-Z][a-zA-Z0-9\_\-]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
- 'name' => strtolower( $m['name'] ),
+ 'name' => strtolower($m['name']),
'literal' => false,
'required' => true,
'positional' => true,
@@ -512,7 +512,7 @@ class Simple implements RouteInterface
* Mandatory literal param, i.e.
* something
*/
- elseif (preg_match('/\G(?P<name>[a-z0-9][a-zA-Z0-9\_]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
+ elseif (preg_match('/\G(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
'name' => $m['name'],
'literal' => true,
@@ -522,7 +522,7 @@ class Simple implements RouteInterface
);
} else {
throw new Exception\InvalidArgumentException(
- 'Cannot understand Console route at "' . substr( $def, $pos ) . '"'
+ 'Cannot understand Console route at "' . substr($def, $pos) . '"'
);
}
@@ -692,17 +692,17 @@ class Simple implements RouteInterface
if (isset($part['alternatives'])) {
if ($part['hasValue']) {
foreach ($part['alternatives'] as $alt) {
- if ($alt == $matchedName) {
+ if ($alt === $matchedName && !isset($matches[$alt])) {
$matches[$alt] = $value;
- } else {
+ } elseif (!isset($matches[$alt])) {
$matches[$alt] = null;
}
}
} else {
foreach ($part['alternatives'] as $alt) {
- if ($alt == $matchedName) {
- $matches[$alt] = true;
- } else {
+ if ($alt === $matchedName && !isset($matches[$alt])) {
+ $matches[$alt] = isset($this->defaults[$alt])? $this->defaults[$alt] : true;
+ } elseif (!isset($matches[$alt])) {
$matches[$alt] = false;
}
}
@@ -768,19 +768,22 @@ class Simple implements RouteInterface
*/
if ($part['hasValue']) {
$matches[$part['name']] = $value;
-
} elseif (isset($part['alternatives'])) {
// from all alternativesm set matching parameter to TRUE and the rest to FALSE
foreach ($part['alternatives'] as $alt) {
- $matches[$alt] = $alt == $value;
+ if ($alt == $value) {
+ $matches[$alt] = isset($this->defaults[$alt])? $this->defaults[$alt] : true;
+ } else {
+ $matches[$alt] = false;
+ }
}
// set alternatives group value
$matches[$part['name']] = $value;
-
- } else {
- // set matching parameter flag to true
- $matches[$part['name']] = true;
+ } elseif (!$part['required']) {
+ // set optional parameter flag
+ $name = $part['name'];
+ $matches[$name] = isset($this->defaults[$name])? $this->defaults[$name] : true;
}
/**
@@ -797,7 +800,26 @@ class Simple implements RouteInterface
return null; // there are extraneous params that were not consumed
}
- return new RouteMatch(array_replace($matches, $this->defaults));
+ /**
+ * Any optional flags that were not entered have value false
+ */
+ foreach ($this->parts as &$part) {
+ if (!$part['required'] && !$part['hasValue']) {
+ if (!isset($matches[$part['name']])) {
+ $matches[$part['name']] = false;
+ }
+ // unset alternatives also should be false
+ if (isset($part['alternatives'])) {
+ foreach ($part['alternatives'] as $alt) {
+ if (!isset($matches[$alt])) {
+ $matches[$alt] = false;
+ }
+ }
+ }
+ }
+ }
+
+ return new RouteMatch(array_replace($this->defaults, $matches));
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
index fd4f55ce75e01951aabc0e21155d163ef881bb9d..62ee9967100836f859565f0a44204f1e4e93465c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
@@ -42,7 +42,7 @@ class SimpleRouteStack extends BaseSimpleRouteStack
* @see RouteStackInterface::addRoute()
* @param string $name
* @param mixed $route
- * @param integer $priority
+ * @param int $priority
* @return SimpleRouteStack
*/
public function addRoute($name, $route, $priority = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Chain.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Chain.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc970ec6fbf2aeb1c4892b3a1cfa541f1905c652
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Chain.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Router\Http;
+
+use ArrayObject;
+use Traversable;
+use Zend\Mvc\Router\Exception;
+use Zend\Mvc\Router\PriorityList;
+use Zend\Mvc\Router\RoutePluginManager;
+use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\RequestInterface as Request;
+
+/**
+ * Chain route.
+ */
+class Chain extends TreeRouteStack implements RouteInterface
+{
+ /**
+ * Chain routes.
+ *
+ * @var array
+ */
+ protected $chainRoutes;
+
+ /**
+ * List of assembled parameters.
+ *
+ * @var array
+ */
+ protected $assembledParams = array();
+
+ /**
+ * Create a new part route.
+ *
+ * @param array $routes
+ * @param RoutePluginManager $routePlugins
+ * @param ArrayObject|null $prototypes
+ */
+ public function __construct(array $routes, RoutePluginManager $routePlugins, ArrayObject $prototypes = null)
+ {
+ $this->chainRoutes = array_reverse($routes);
+ $this->routePluginManager = $routePlugins;
+ $this->routes = new PriorityList();
+ $this->prototypes = $prototypes;
+ }
+
+ /**
+ * factory(): defined by RouteInterface interface.
+ *
+ * @see \Zend\Mvc\Router\RouteInterface::factory()
+ * @param mixed $options
+ * @throws Exception\InvalidArgumentException
+ * @return Part
+ */
+ public static function factory($options = array())
+ {
+ if ($options instanceof Traversable) {
+ $options = ArrayUtils::iteratorToArray($options);
+ } elseif (!is_array($options)) {
+ throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable set of options');
+ }
+
+ if (!isset($options['routes'])) {
+ throw new Exception\InvalidArgumentException('Missing "routes" in options array');
+ }
+
+ if (!isset($options['prototypes'])) {
+ $options['prototypes'] = null;
+ }
+
+ if ($options['routes'] instanceof Traversable) {
+ $options['routes'] = ArrayUtils::iteratorToArray($options['child_routes']);
+ }
+
+ if (!isset($options['route_plugins'])) {
+ throw new Exception\InvalidArgumentException('Missing "route_plugins" in options array');
+ }
+
+ return new static(
+ $options['routes'],
+ $options['route_plugins'],
+ $options['prototypes']
+ );
+ }
+
+ /**
+ * match(): defined by RouteInterface interface.
+ *
+ * @see \Zend\Mvc\Router\RouteInterface::match()
+ * @param Request $request
+ * @param int|null $pathOffset
+ * @param array $options
+ * @return RouteMatch|null
+ */
+ public function match(Request $request, $pathOffset = null, array $options = array())
+ {
+ if (!method_exists($request, 'getUri')) {
+ return null;
+ }
+
+ if ($pathOffset === null) {
+ $mustTerminate = true;
+ $pathOffset = 0;
+ } else {
+ $mustTerminate = false;
+ }
+
+ if ($this->chainRoutes !== null) {
+ $this->addRoutes($this->chainRoutes);
+ $this->chainRoutes = null;
+ }
+
+ $match = new RouteMatch(array());
+ $uri = $request->getUri();
+ $pathLength = strlen($uri->getPath());
+
+ foreach ($this->routes as $route) {
+ $subMatch = $route->match($request, $pathOffset, $options);
+
+ if ($subMatch === null) {
+ return null;
+ }
+
+ $match->merge($subMatch);
+ $pathOffset += $subMatch->getLength();
+ }
+
+ if ($mustTerminate && $pathOffset !== $pathLength) {
+ return null;
+ }
+
+ return $match;
+ }
+
+ /**
+ * assemble(): Defined by RouteInterface interface.
+ *
+ * @see \Zend\Mvc\Router\RouteInterface::assemble()
+ * @param array $params
+ * @param array $options
+ * @return mixed
+ */
+ public function assemble(array $params = array(), array $options = array())
+ {
+ if ($this->chainRoutes !== null) {
+ $this->addRoutes($this->chainRoutes);
+ $this->chainRoutes = null;
+ }
+
+ $this->assembledParams = array();
+
+ end($this->routes);
+ $lastRouteKey = key($this->routes);
+ $path = '';
+
+ foreach ($this->routes as $key => $route) {
+ $chainOptions = $options;
+ $hasChild = isset($options['has_child']) ? $options['has_child'] : false;
+
+ $chainOptions['has_child'] = ($hasChild || $key !== $lastRouteKey);
+
+ $path .= $route->assemble($params, $chainOptions);
+ $params = array_diff_key($params, array_flip($route->getAssembledParams()));
+
+ $this->assembledParams += $route->getAssembledParams();
+ }
+
+ return $path;
+ }
+
+ /**
+ * getAssembledParams(): defined by RouteInterface interface.
+ *
+ * @see RouteInterface::getAssembledParams
+ * @return array
+ */
+ public function getAssembledParams()
+ {
+ return $this->assembledParams;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
index 35b4fd235491401110cefac9a87200866e42ace0..3ce4d750437bec31dd0242a4e19b42347afbd888 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
@@ -16,8 +16,6 @@ use Zend\Stdlib\RequestInterface as Request;
/**
* Hostname route.
- *
- * @see http://guides.rubyonrails.org/routing.html
*/
class Hostname implements RouteInterface
{
@@ -75,8 +73,8 @@ class Hostname implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Hostname
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -162,7 +160,7 @@ class Hostname implements RouteInterface
*
* @param array $parts
* @param array $constraints
- * @param integer $groupIndex
+ * @param int $groupIndex
* @return string
* @throws Exception\RuntimeException
*/
@@ -204,7 +202,7 @@ class Hostname implements RouteInterface
*
* @param array $parts
* @param array $mergedParams
- * @param bool $isOptional
+ * @param bool $isOptional
* @return string
* @throws Exception\RuntimeException
* @throws Exception\InvalidArgumentException
@@ -263,7 +261,7 @@ class Hostname implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
- * @return RouteMatch
+ * @return RouteMatch|null
*/
public function match(Request $request)
{
@@ -280,7 +278,7 @@ class Hostname implements RouteInterface
return null;
}
- $params = array();
+ $params = array();
foreach ($this->paramMap as $index => $name) {
if (isset($matches[$index]) && $matches[$index] !== '') {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php
index 302628e64b100ae5e1300d66e52ab07693f1ef29..7bbd81e0ba8d80f104e4ab2c2ea815e5d4b597b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php
@@ -16,8 +16,6 @@ use Zend\Stdlib\RequestInterface as Request;
/**
* Literal route.
- *
- * @see http://guides.rubyonrails.org/routing.html
*/
class Literal implements RouteInterface
{
@@ -52,8 +50,8 @@ class Literal implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws Exception\InvalidArgumentException
* @return Literal
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -78,8 +76,8 @@ class Literal implements RouteInterface
* match(): defined by RouteInterface interface.
*
* @see \Zend\Mvc\Router\RouteInterface::match()
- * @param Request $request
- * @param int|null $pathOffset
+ * @param Request $request
+ * @param integer|null $pathOffset
* @return RouteMatch|null
*/
public function match(Request $request, $pathOffset = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php
index 1791c9bffd0ae7fd27b37a3fc3749b54eeaa4c3d..de2628a0ca9b6ec2e6f6ecb0dacf7e8de9e9dc44 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php
@@ -50,8 +50,8 @@ class Method implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws Exception\InvalidArgumentException
* @return Method
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -86,8 +86,8 @@ class Method implements RouteInterface
}
$requestVerb = strtoupper($request->getMethod());
- $matchVerbs = explode(',', strtoupper($this->verb));
- $matchVerbs = array_map('trim', $matchVerbs);
+ $matchVerbs = explode(',', strtoupper($this->verb));
+ $matchVerbs = array_map('trim', $matchVerbs);
if (in_array($requestVerb, $matchVerbs)) {
return new RouteMatch($this->defaults);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php
index 1f66a83f5826efbba35534c65ed3cbe4fcb63063..53eeb06078bb71ad81a5db4a1174d9d2d325dd7c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php
@@ -9,6 +9,7 @@
namespace Zend\Mvc\Router\Http;
+use ArrayObject;
use Traversable;
use Zend\Mvc\Router\Exception;
use Zend\Mvc\Router\PriorityList;
@@ -17,9 +18,7 @@ use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\RequestInterface as Request;
/**
- * RouteInterface part.
- *
- * @see http://guides.rubyonrails.org/routing.html
+ * Part route.
*/
class Part extends TreeRouteStack implements RouteInterface
{
@@ -48,12 +47,13 @@ class Part extends TreeRouteStack implements RouteInterface
* Create a new part route.
*
* @param mixed $route
- * @param bool $mayTerminate
+ * @param bool $mayTerminate
* @param RoutePluginManager $routePlugins
* @param array|null $childRoutes
+ * @param ArrayObject|null $prototypes
* @throws Exception\InvalidArgumentException
*/
- public function __construct($route, $mayTerminate, RoutePluginManager $routePlugins, array $childRoutes = null)
+ public function __construct($route, $mayTerminate, RoutePluginManager $routePlugins, array $childRoutes = null, ArrayObject $prototypes = null)
{
$this->routePluginManager = $routePlugins;
@@ -68,6 +68,7 @@ class Part extends TreeRouteStack implements RouteInterface
$this->route = $route;
$this->mayTerminate = $mayTerminate;
$this->childRoutes = $childRoutes;
+ $this->prototypes = $prototypes;
$this->routes = new PriorityList();
}
@@ -76,8 +77,8 @@ class Part extends TreeRouteStack implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param mixed $options
- * @throws Exception\InvalidArgumentException
* @return Part
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -95,6 +96,10 @@ class Part extends TreeRouteStack implements RouteInterface
throw new Exception\InvalidArgumentException('Missing "route_plugins" in options array');
}
+ if (!isset($options['prototypes'])) {
+ $options['prototypes'] = null;
+ }
+
if (!isset($options['may_terminate'])) {
$options['may_terminate'] = false;
}
@@ -102,28 +107,36 @@ class Part extends TreeRouteStack implements RouteInterface
if (!isset($options['child_routes']) || !$options['child_routes']) {
$options['child_routes'] = null;
}
+
if ($options['child_routes'] instanceof Traversable) {
$options['child_routes'] = ArrayUtils::iteratorToArray($options['child_routes']);
}
- return new static($options['route'], $options['may_terminate'], $options['route_plugins'], $options['child_routes']);
+ return new static(
+ $options['route'],
+ $options['may_terminate'],
+ $options['route_plugins'],
+ $options['child_routes'],
+ $options['prototypes']
+ );
}
/**
* match(): defined by RouteInterface interface.
*
* @see \Zend\Mvc\Router\RouteInterface::match()
- * @param Request $request
- * @param int|null $pathOffset
+ * @param Request $request
+ * @param integer|null $pathOffset
+ * @param array $options
* @return RouteMatch|null
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(Request $request, $pathOffset = null, array $options = array())
{
if ($pathOffset === null) {
$pathOffset = 0;
}
- $match = $this->route->match($request, $pathOffset);
+ $match = $this->route->match($request, $pathOffset, $options);
if ($match !== null && method_exists($request, 'getUri')) {
if ($this->childRoutes !== null) {
@@ -144,7 +157,7 @@ class Part extends TreeRouteStack implements RouteInterface
}
foreach ($this->routes as $name => $route) {
- if (($subMatch = $route->match($request, $nextOffset)) instanceof RouteMatch) {
+ if (($subMatch = $route->match($request, $nextOffset, $options)) instanceof RouteMatch) {
if ($match->getLength() + $subMatch->getLength() + $pathOffset === $pathLength) {
return $match->merge($subMatch)->setMatchedRouteName($name);
}
@@ -166,7 +179,7 @@ class Part extends TreeRouteStack implements RouteInterface
*/
public function assemble(array $params = array(), array $options = array())
{
- if ($this->childRoutes !== null) {
+ if ($this->childRoutes !== null) {
$this->addRoutes($this->childRoutes);
$this->childRoutes = null;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php
index 175b56b7e88bed7aa5d812df342a541cd73474fb..e7a322a8817691eff02f600db9b0b6008eaf7fa8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php
@@ -18,12 +18,10 @@ use Zend\Stdlib\RequestInterface as Request;
/**
* Query route.
*
- * @see http://guides.rubyonrails.org/routing.html
* @deprecated
*/
class Query implements RouteInterface
{
-
/**
* Default values.
*
@@ -57,8 +55,8 @@ class Query implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws Exception\InvalidArgumentException
* @return Query
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -68,7 +66,6 @@ class Query implements RouteInterface
throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable set of options');
}
-
if (!isset($options['defaults'])) {
$options['defaults'] = array();
}
@@ -81,10 +78,9 @@ class Query implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
- * @param int|null $pathOffset
* @return RouteMatch
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(Request $request)
{
// We don't merge the query parameters into the rotue match here because
// of possible security problems. Use the Query object instead which is
@@ -95,12 +91,13 @@ class Query implements RouteInterface
/**
* Recursively urldecodes keys and values from an array
*
- * @param array $array
+ * @param array $array
* @return array
*/
protected function recursiveUrldecode(array $array)
{
$matches = array();
+
foreach ($array as $key => $value) {
if (is_array($value)) {
$matches[urldecode($key)] = $this->recursiveUrldecode($value);
@@ -108,13 +105,14 @@ class Query implements RouteInterface
$matches[urldecode($key)] = urldecode($value);
}
}
+
return $matches;
}
/**
* assemble(): Defined by RouteInterface interface.
- * @see \Zend\Mvc\Router\RouteInterface::assemble()
*
+ * @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php
index 8b153f089bdca3a65d1760a3062c0394ba6d1d35..bbbdec3518fbe932e79a64ff8cfce31b3ca3106e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php
@@ -16,8 +16,6 @@ use Zend\Stdlib\RequestInterface as Request;
/**
* Regex route.
- *
- * @see http://guides.rubyonrails.org/routing.html
*/
class Regex implements RouteInterface
{
@@ -70,8 +68,8 @@ class Regex implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Regex
+ * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -100,8 +98,8 @@ class Regex implements RouteInterface
* match(): defined by RouteInterface interface.
*
* @param Request $request
- * @param integer $pathOffset
- * @return RouteMatch
+ * @param int $pathOffset
+ * @return RouteMatch|null
*/
public function match(Request $request, $pathOffset = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php
index 07b822b0595d4ebe6bae633caf5d4877f722b325..9c7d8b0e9f528d166a599557d0fd0d0d0dc7587f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php
@@ -19,7 +19,7 @@ class RouteMatch extends BaseRouteMatch
/**
* Length of the matched path.
*
- * @var integer
+ * @var int
*/
protected $length;
@@ -27,7 +27,7 @@ class RouteMatch extends BaseRouteMatch
* Create a part RouteMatch with given parameters and length.
*
* @param array $params
- * @param integer $length
+ * @param int $length
*/
public function __construct(array $params, $length = 0)
{
@@ -73,7 +73,7 @@ class RouteMatch extends BaseRouteMatch
/**
* Get the matched path length.
*
- * @return integer
+ * @return int
*/
public function getLength()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php
index a19c67149e2b443b7587eeadf98e1c8887214ade..0971ee50936dbb5b6f2c60a0bdd8e440090469df 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php
@@ -16,8 +16,6 @@ use Zend\Stdlib\RequestInterface as Request;
/**
* Scheme route.
- *
- * @see http://guides.rubyonrails.org/routing.html
*/
class Scheme implements RouteInterface
{
@@ -79,7 +77,7 @@ class Scheme implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
- * @return RouteMatch
+ * @return RouteMatch|null
*/
public function match(Request $request)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
index 1be9dc2aec9a41dae1316cd3253c649d4d6a9ae7..244b10ebd04279d89bd23eb77ba5e958620006b3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
@@ -10,19 +10,20 @@
namespace Zend\Mvc\Router\Http;
use Traversable;
+use Zend\I18n\Translator\Translator;
use Zend\Mvc\Router\Exception;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\RequestInterface as Request;
/**
* Segment route.
- *
- * @see http://guides.rubyonrails.org/routing.html
*/
class Segment implements RouteInterface
{
/**
- * @var array Cache for the encode output
+ * Cache for the encode output.
+ *
+ * @var array
*/
protected static $cacheEncode = array();
@@ -93,6 +94,13 @@ class Segment implements RouteInterface
*/
protected $assembledParams = array();
+ /**
+ * Translation keys used in the regex.
+ *
+ * @var array
+ */
+ protected $translationKeys = array();
+
/**
* Create a new regex route.
*
@@ -112,8 +120,8 @@ class Segment implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Segment
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -163,20 +171,12 @@ class Segment implements RouteInterface
}
if ($matches['token'] === ':') {
- if (isset($def[$currentPos]) && $def[$currentPos] === '{') {
- if (!preg_match('(\G\{(?P<name>[^}]+)\}:?)', $def, $matches, 0, $currentPos)) {
- throw new Exception\RuntimeException('Translated parameter missing closing bracket');
- }
-
- $levelParts[$level][] = array('translated-parameter', $matches['name']);
- } else {
- if (!preg_match('(\G(?P<name>[^:/{\[\]]+)(?:{(?P<delimiters>[^}]+)})?:?)', $def, $matches, 0, $currentPos)) {
- throw new Exception\RuntimeException('Found empty parameter name');
- }
-
- $levelParts[$level][] = array('parameter', $matches['name'], isset($matches['delimiters']) ? $matches['delimiters'] : null);
+ if (!preg_match('(\G(?P<name>[^:/{\[\]]+)(?:{(?P<delimiters>[^}]+)})?:?)', $def, $matches, 0, $currentPos)) {
+ throw new Exception\RuntimeException('Found empty parameter name');
}
+ $levelParts[$level][] = array('parameter', $matches['name'], isset($matches['delimiters']) ? $matches['delimiters'] : null);
+
$currentPos += strlen($matches[0]);
} elseif ($matches['token'] === '{') {
if (!preg_match('(\G(?P<literal>[^}]+)\})', $def, $matches, 0, $currentPos)) {
@@ -215,9 +215,8 @@ class Segment implements RouteInterface
*
* @param array $parts
* @param array $constraints
- * @param integer $groupIndex
+ * @param int $groupIndex
* @return string
- * @throws Exception\RuntimeException
*/
protected function buildRegex(array $parts, array $constraints, &$groupIndex = 1)
{
@@ -247,15 +246,10 @@ class Segment implements RouteInterface
$regex .= '(?:' . $this->buildRegex($part[1], $constraints, $groupIndex) . ')?';
break;
- // @codeCoverageIgnoreStart
case 'translated-literal':
- throw new Exception\RuntimeException('Translated literals are not implemented yet');
- break;
-
- case 'translated-parameter':
- throw new Exception\RuntimeException('Translated parameters are not implemented yet');
+ $regex .= '#' . $part[1] . '#';
+ $this->translationKeys[] = $part[1];
break;
- // @codeCoverageIgnoreEnd
}
}
@@ -267,14 +261,25 @@ class Segment implements RouteInterface
*
* @param array $parts
* @param array $mergedParams
- * @param bool $isOptional
- * @param bool $hasChild
+ * @param bool $isOptional
+ * @param bool $hasChild
+ * @param array $options
* @return string
- * @throws Exception\RuntimeException
* @throws Exception\InvalidArgumentException
+ * @throws Exception\RuntimeException
*/
- protected function buildPath(array $parts, array $mergedParams, $isOptional, $hasChild)
+ protected function buildPath(array $parts, array $mergedParams, $isOptional, $hasChild, array $options)
{
+ if ($this->translationKeys) {
+ if (!isset($options['translator']) || !$options['translator'] instanceof Translator) {
+ throw new Exception\RuntimeException('No translator provided');
+ }
+
+ $translator = $options['translator'];
+ $textDomain = (isset($options['text_domain']) ? $options['text_domain'] : 'default');
+ $locale = (isset($options['locale']) ? $options['locale'] : null);
+ }
+
$path = '';
$skip = true;
$skippable = false;
@@ -305,7 +310,7 @@ class Segment implements RouteInterface
case 'optional':
$skippable = true;
- $optionalPart = $this->buildPath($part[1], $mergedParams, true, $hasChild);
+ $optionalPart = $this->buildPath($part[1], $mergedParams, true, $hasChild, $options);
if ($optionalPart !== '') {
$path .= $optionalPart;
@@ -313,15 +318,9 @@ class Segment implements RouteInterface
}
break;
- // @codeCoverageIgnoreStart
case 'translated-literal':
- throw new Exception\RuntimeException('Translated literals are not implemented yet');
- break;
-
- case 'translated-parameter':
- throw new Exception\RuntimeException('Translated parameters are not implemented yet');
+ $path .= $translator->translate($part[1], $textDomain, $locale);
break;
- // @codeCoverageIgnoreEnd
}
}
@@ -336,11 +335,13 @@ class Segment implements RouteInterface
* match(): defined by RouteInterface interface.
*
* @see \Zend\Mvc\Router\RouteInterface::match()
- * @param Request $request
+ * @param Request $request
* @param string|null $pathOffset
- * @return RouteMatch
+ * @param array $options
+ * @return RouteMatch|null
+ * @throws Exception\RuntimeException
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(Request $request, $pathOffset = null, array $options = array())
{
if (!method_exists($request, 'getUri')) {
return null;
@@ -349,10 +350,26 @@ class Segment implements RouteInterface
$uri = $request->getUri();
$path = $uri->getPath();
+ $regex = $this->regex;
+
+ if ($this->translationKeys) {
+ if (!isset($options['translator']) || !$options['translator'] instanceof Translator) {
+ throw new Exception\RuntimeException('No translator provided');
+ }
+
+ $translator = $options['translator'];
+ $textDomain = (isset($options['text_domain']) ? $options['text_domain'] : 'default');
+ $locale = (isset($options['locale']) ? $options['locale'] : null);
+
+ foreach ($this->translationKeys as $key) {
+ $regex = str_replace('#' . $key . '#', $translator->translate($key, $textDomain, $locale), $regex);
+ }
+ }
+
if ($pathOffset !== null) {
- $result = preg_match('(\G' . $this->regex . ')', $path, $matches, null, $pathOffset);
+ $result = preg_match('(\G' . $regex . ')', $path, $matches, null, $pathOffset);
} else {
- $result = preg_match('(^' . $this->regex . '$)', $path, $matches);
+ $result = preg_match('(^' . $regex . '$)', $path, $matches);
}
if (!$result) {
@@ -387,7 +404,8 @@ class Segment implements RouteInterface
$this->parts,
array_merge($this->defaults, $params),
false,
- (isset($options['has_child']) ? $options['has_child'] : false)
+ (isset($options['has_child']) ? $options['has_child'] : false),
+ $options
);
}
@@ -405,7 +423,7 @@ class Segment implements RouteInterface
/**
* Encode a path segment.
*
- * @param string $value
+ * @param string $value
* @return string
*/
protected function encode($value)
@@ -420,7 +438,7 @@ class Segment implements RouteInterface
/**
* Decode a path segment.
*
- * @param string $value
+ * @param string $value
* @return string
*/
protected function decode($value)
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
new file mode 100644
index 0000000000000000000000000000000000000000..35326718bc8b6946e8ded0e0af657469bf645e49
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Router\Http;
+
+use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorAwareInterface;
+use Zend\Stdlib\RequestInterface as Request;
+
+/**
+ * Translator aware tree route stack.
+ */
+class TranslatorAwareTreeRouteStack extends TreeRouteStack implements TranslatorAwareInterface
+{
+ /**
+ * Translator used for translatable segments.
+ *
+ * @var Translator
+ */
+ protected $translator;
+
+ /**
+ * Whether the translator is enabled.
+ *
+ * @var bool
+ */
+ protected $translatorEnabled = true;
+
+ /**
+ * Translator text domain to use.
+ *
+ * @var string
+ */
+ protected $translatorTextDomain = 'default';
+
+ /**
+ * match(): defined by \Zend\Mvc\Router\RouteInterface
+ *
+ * @see \Zend\Mvc\Router\RouteInterface::match()
+ * @param Request $request
+ * @param integer|null $pathOffset
+ * @param array $options
+ * @return RouteMatch|null
+ */
+ public function match(Request $request, $pathOffset = null, array $options = array())
+ {
+ if ($this->hasTranslator() && $this->isTranslatorEnabled() && !isset($options['translator'])) {
+ $options['translator'] = $this->getTranslator();
+ }
+
+ if (!isset($options['text_domain'])) {
+ $options['text_domain'] = $this->getTranslatorTextDomain();
+ }
+
+ return parent::match($request, $pathOffset, $options);
+ }
+
+ /**
+ * assemble(): defined by \Zend\Mvc\Router\RouteInterface interface.
+ *
+ * @see \Zend\Mvc\Router\RouteInterface::assemble()
+ * @param array $params
+ * @param array $options
+ * @return mixed
+ * @throws Exception\InvalidArgumentException
+ * @throws Exception\RuntimeException
+ */
+ public function assemble(array $params = array(), array $options = array())
+ {
+ if ($this->hasTranslator() && $this->isTranslatorEnabled() && !isset($options['translator'])) {
+ $options['translator'] = $this->getTranslator();
+ }
+
+ if (!isset($options['text_domain'])) {
+ $options['text_domain'] = $this->getTranslatorTextDomain();
+ }
+
+ return parent::assemble($params, $options);
+ }
+
+ /**
+ * setTranslator(): defined by TranslatorAwareInterface.
+ *
+ * @see TranslatorAwareInterface::setTranslator()
+ * @param Translator $translator
+ * @param string $textDomain
+ * @return TreeRouteStack
+ */
+ public function setTranslator(Translator $translator = null, $textDomain = null)
+ {
+ $this->translator = $translator;
+
+ if ($textDomain !== null) {
+ $this->setTranslatorTextDomain($textDomain);
+ }
+
+ return $this;
+ }
+
+ /**
+ * getTranslator(): defined by TranslatorAwareInterface.
+ *
+ * @see TranslatorAwareInterface::getTranslator()
+ * @return Translator
+ */
+ public function getTranslator()
+ {
+ return $this->translator;
+ }
+
+ /**
+ * hasTranslator(): defined by TranslatorAwareInterface.
+ *
+ * @see TranslatorAwareInterface::hasTranslator()
+ * @return bool
+ */
+ public function hasTranslator()
+ {
+ return $this->translator !== null;
+ }
+
+ /**
+ * setTranslatorEnabled(): defined by TranslatorAwareInterface.
+ *
+ * @see TranslatorAwareInterface::setTranslatorEnabled()
+ * @param bool $enabled
+ * @return TreeRouteStack
+ */
+ public function setTranslatorEnabled($enabled = true)
+ {
+ $this->translatorEnabled = $enabled;
+ return $this;
+ }
+
+ /**
+ * isTranslatorEnabled(): defined by TranslatorAwareInterface.
+ *
+ * @see TranslatorAwareInterface::isTranslatorEnabled()
+ * @return bool
+ */
+ public function isTranslatorEnabled()
+ {
+ return $this->translatorEnabled;
+ }
+
+ /**
+ * setTranslatorTextDomain(): defined by TranslatorAwareInterface.
+ *
+ * @see TranslatorAwareInterface::setTranslatorTextDomain()
+ * @param string $textDomain
+ * @return mixed
+ */
+ public function setTranslatorTextDomain($textDomain = 'default')
+ {
+ $this->translatorTextDomain = $textDomain;
+
+ return $this;
+ }
+
+ /**
+ * getTranslatorTextDomain(): defined by TranslatorAwareInterface.
+ *
+ * @see TranslatorAwareInterface::getTranslatorTextDomain()
+ * @return string
+ */
+ public function getTranslatorTextDomain()
+ {
+ return $this->translatorTextDomain;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php
index 5eaec557a7fde7938312b63d779e551d2d46611a..779dcbc690961de4e68b99549fc7fd567a2047e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -9,6 +9,7 @@
namespace Zend\Mvc\Router\Http;
+use ArrayObject;
use Traversable;
use Zend\Mvc\Router\Exception;
use Zend\Mvc\Router\SimpleRouteStack;
@@ -35,6 +36,41 @@ class TreeRouteStack extends SimpleRouteStack
*/
protected $requestUri;
+ /**
+ * Prototype routes.
+ *
+ * We use an ArrayObject in this case so we can easily pass it down the tree
+ * by reference.
+ *
+ * @var ArrayObject
+ */
+ protected $prototypes;
+
+ /**
+ * factory(): defined by RouteInterface interface.
+ *
+ * @see \Zend\Mvc\Router\RouteInterface::factory()
+ * @param array|Traversable $options
+ * @return SimpleRouteStack
+ * @throws Exception\InvalidArgumentException
+ */
+ public static function factory($options = array())
+ {
+ if ($options instanceof Traversable) {
+ $options = ArrayUtils::iteratorToArray($options);
+ } elseif (!is_array($options)) {
+ throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable set of options');
+ }
+
+ $instance = parent::factory($options);
+
+ if (isset($options['prototypes'])) {
+ $instance->addPrototypes($options['prototypes']);
+ }
+
+ return $instance;
+ }
+
/**
* init(): defined by SimpleRouteStack.
*
@@ -42,17 +78,20 @@ class TreeRouteStack extends SimpleRouteStack
*/
protected function init()
{
+ $this->prototypes = new ArrayObject;
+
$routes = $this->routePluginManager;
foreach (array(
+ 'chain' => __NAMESPACE__ . '\Chain',
'hostname' => __NAMESPACE__ . '\Hostname',
'literal' => __NAMESPACE__ . '\Literal',
+ 'method' => __NAMESPACE__ . '\Method',
'part' => __NAMESPACE__ . '\Part',
+ 'query' => __NAMESPACE__ . '\Query',
'regex' => __NAMESPACE__ . '\Regex',
'scheme' => __NAMESPACE__ . '\Scheme',
'segment' => __NAMESPACE__ . '\Segment',
'wildcard' => __NAMESPACE__ . '\Wildcard',
- 'query' => __NAMESPACE__ . '\Query',
- 'method' => __NAMESPACE__ . '\Method',
) as $name => $class
) {
$routes->setInvokableClass($name, $class);
@@ -65,7 +104,7 @@ class TreeRouteStack extends SimpleRouteStack
* @see RouteStackInterface::addRoute()
* @param string $name
* @param mixed $route
- * @param integer $priority
+ * @param int $priority
* @return TreeRouteStack
*/
public function addRoute($name, $route, $priority = null)
@@ -81,20 +120,44 @@ class TreeRouteStack extends SimpleRouteStack
* routeFromArray(): defined by SimpleRouteStack.
*
* @see SimpleRouteStack::routeFromArray()
- * @param array|Traversable $specs
+ * @param string|array|Traversable $specs
* @return RouteInterface
- * @throws Exception\InvalidArgumentException
- * @throws Exception\RuntimeException
+ * @throws Exception\InvalidArgumentException When route definition is not an array nor traversable
+ * @throws Exception\InvalidArgumentException When chain routes are not an array nor traversable
+ * @throws Exception\RuntimeException When a generated routes does not implement the HTTP route interface
*/
protected function routeFromArray($specs)
{
- if ($specs instanceof Traversable) {
+ if (is_string($specs)) {
+ if (null === ($route = $this->getPrototype($specs))) {
+ throw new Exception\RuntimeException(sprintf('Could not find prototype with name %s', $specs));
+ }
+
+ return $route;
+ } elseif ($specs instanceof Traversable) {
$specs = ArrayUtils::iteratorToArray($specs);
} elseif (!is_array($specs)) {
throw new Exception\InvalidArgumentException('Route definition must be an array or Traversable object');
}
- $route = parent::routeFromArray($specs);
+ if (isset($specs['chain_routes'])) {
+ if (!is_array($specs['chain_routes'])) {
+ throw new Exception\InvalidArgumentException('Chain routes must be an array or Traversable object');
+ }
+
+ $chainRoutes = array_merge(array($specs), $specs['chain_routes']);
+ unset($chainRoutes[0]['chain_routes']);
+
+ $options = array(
+ 'routes' => $chainRoutes,
+ 'route_plugins' => $this->routePluginManager,
+ 'prototypes' => $this->prototypes,
+ );
+
+ $route = $this->routePluginManager->get('chain', $options);
+ } else {
+ $route = parent::routeFromArray($specs);
+ }
if (!$route instanceof RouteInterface) {
throw new Exception\RuntimeException('Given route does not implement HTTP route interface');
@@ -106,6 +169,7 @@ class TreeRouteStack extends SimpleRouteStack
'may_terminate' => (isset($specs['may_terminate']) && $specs['may_terminate']),
'child_routes' => $specs['child_routes'],
'route_plugins' => $this->routePluginManager,
+ 'prototypes' => $this->prototypes,
);
$priority = (isset($route->priority) ? $route->priority : null);
@@ -117,14 +181,69 @@ class TreeRouteStack extends SimpleRouteStack
return $route;
}
+ /**
+ * Add multiple prototypes at once.
+ *
+ * @param Traversable $routes
+ * @return TreeRouteStack
+ * @throws Exception\InvalidArgumentException
+ */
+ public function addPrototypes($routes)
+ {
+ if (!is_array($routes) && !$routes instanceof Traversable) {
+ throw new Exception\InvalidArgumentException('addPrototypes expects an array or Traversable set of routes');
+ }
+
+ foreach ($routes as $name => $route) {
+ $this->addPrototype($name, $route);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a prototype.
+ *
+ * @param string $name
+ * @param mixed $route
+ * @return TreeRouteStack
+ */
+ public function addPrototype($name, $route)
+ {
+ if (!$route instanceof RouteInterface) {
+ $route = $this->routeFromArray($route);
+ }
+
+ $this->prototypes[$name] = $route;
+
+ return $this;
+ }
+
+ /**
+ * Get a prototype.
+ *
+ * @param string $name
+ * @return RouterInterface|null
+ */
+ public function getPrototype($name)
+ {
+ if (isset($this->prototypes[$name])) {
+ return $this->prototypes[$name];
+ }
+
+ return null;
+ }
+
/**
* match(): defined by \Zend\Mvc\Router\RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::match()
- * @param Request $request
- * @return RouteMatch
+ * @param Request $request
+ * @param integer|null $pathOffset
+ * @param array $options
+ * @return RouteMatch|null
*/
- public function match(Request $request)
+ public function match(Request $request, $pathOffset = null, array $options = array())
{
if (!method_exists($request, 'getUri')) {
return null;
@@ -137,28 +256,35 @@ class TreeRouteStack extends SimpleRouteStack
$uri = $request->getUri();
$baseUrlLength = strlen($this->baseUrl) ?: null;
+ if ($pathOffset !== null) {
+ $baseUrlLength += $pathOffset;
+ }
+
if ($this->requestUri === null) {
$this->setRequestUri($uri);
}
if ($baseUrlLength !== null) {
$pathLength = strlen($uri->getPath()) - $baseUrlLength;
+ } else {
+ $pathLength = null;
+ }
- foreach ($this->routes as $name => $route) {
- if (($match = $route->match($request, $baseUrlLength)) instanceof RouteMatch && $match->getLength() === $pathLength) {
- $match->setMatchedRouteName($name);
+ foreach ($this->routes as $name => $route) {
+ if (
+ ($match = $route->match($request, $baseUrlLength, $options)) instanceof RouteMatch
+ && ($pathLength === null || $match->getLength() === $pathLength)
+ ) {
+ $match->setMatchedRouteName($name);
- foreach ($this->defaultParams as $paramName => $value) {
- if ($match->getParam($paramName) === null) {
- $match->setParam($paramName, $value);
- }
+ foreach ($this->defaultParams as $paramName => $value) {
+ if ($match->getParam($paramName) === null) {
+ $match->setParam($paramName, $value);
}
-
- return $match;
}
+
+ return $match;
}
- } else {
- return parent::match($request);
}
return null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php
index eb4e6c1a1e3cf7c1171b4e7a3a9a331b7f4421d5..436fe093a1707deb892df92f12ba65495cbd4b05 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php
@@ -16,8 +16,6 @@ use Zend\Stdlib\RequestInterface as Request;
/**
* Wildcard route.
- *
- * @see http://guides.rubyonrails.org/routing.html
*/
class Wildcard implements RouteInterface
{
@@ -68,8 +66,8 @@ class Wildcard implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Wildcard
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -98,9 +96,9 @@ class Wildcard implements RouteInterface
* match(): defined by RouteInterface interface.
*
* @see \Zend\Mvc\Router\RouteInterface::match()
- * @param Request $request
- * @param int|null $pathOffset
- * @return RouteMatch
+ * @param Request $request
+ * @param integer|null $pathOffset
+ * @return RouteMatch|null
*/
public function match(Request $request, $pathOffset = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
index 7269acd35865df30ee7fdecbc12fa633ead26563..15cd823a708a79ce4cc4878d56422ce58ce3be95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
@@ -14,8 +14,7 @@ use Iterator;
/**
* Priority list
- *
- */
+ */
class PriorityList implements Iterator, Countable
{
/**
@@ -28,14 +27,14 @@ class PriorityList implements Iterator, Countable
/**
* Serial assigned to routes to preserve LIFO.
*
- * @var integer
+ * @var int
*/
protected $serial = 0;
/**
* Internal counter to avoid usage of count().
*
- * @var integer
+ * @var int
*/
protected $count = 0;
@@ -51,7 +50,7 @@ class PriorityList implements Iterator, Countable
*
* @param string $name
* @param RouteInterface $route
- * @param integer $priority
+ * @param int $priority
* @return void
*/
public function insert($name, RouteInterface $route, $priority)
@@ -127,7 +126,7 @@ class PriorityList implements Iterator, Countable
*
* @param array $route1,
* @param array $route2
- * @return integer
+ * @return int
*/
protected function compare(array $route1, array $route2)
{
@@ -203,7 +202,7 @@ class PriorityList implements Iterator, Countable
* count(): defined by Countable interface.
*
* @see Countable::count()
- * @return integer
+ * @return int
*/
public function count()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php
index 946d079879a5836c33aa2e922faf7b1d99bd8615..c845e569c7e70bdc768b507b120664836ff62fc2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php
@@ -19,7 +19,7 @@ interface RouteInterface
/**
* Priority used for route stacks.
*
- * @var integer
+ * @var int
* public $priority;
*/
@@ -35,7 +35,7 @@ interface RouteInterface
* Match a given request.
*
* @param Request $request
- * @return RouteMatch
+ * @return RouteMatch|null
*/
public function match(Request $request);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php
index b6837dca8563bce705d14b0455188563ad9eae74..9cbeff44bedf25da329f55e702e98019c35d954a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php
@@ -87,7 +87,7 @@ class RouteMatch
* Get a specific parameter.
*
* @param string $name
- * @param mixed $default
+ * @param mixed $default
* @return mixed
*/
public function getParam($name, $default = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php
index 50b2bba5e2559e338b1b74e7098c779d1a2d4a35..312cff3439b7e8998324f912568fdcedbd53aba7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php
@@ -22,20 +22,22 @@ use Zend\ServiceManager\AbstractPluginManager;
class RoutePluginManager extends AbstractPluginManager
{
/**
- * @var bool Do not share instances
+ * Do not share instances.
+ *
+ * @var bool
*/
protected $shareByDefault = false;
/**
- * Override setInvokableClass()
+ * Override setInvokableClass().
*
* Performs normal operation, but also auto-aliases the class name to the
* service name. This ensures that providing the FQCN does not trigger an
* abstract factory later.
*
- * @param string $name
- * @param string $invokableClass
- * @param null|bool $shared
+ * @param string $name
+ * @param string $invokableClass
+ * @param null|bool $shared
* @return RoutePluginManager
*/
public function setInvokableClass($name, $invokableClass, $shared = null)
@@ -48,7 +50,7 @@ class RoutePluginManager extends AbstractPluginManager
}
/**
- * Validate the plugin
+ * Validate the plugin.
*
* Checks that the filter loaded is either a valid callback or an instance
* of FilterInterface.
@@ -72,7 +74,7 @@ class RoutePluginManager extends AbstractPluginManager
}
/**
- * Attempt to create an instance via an invokable class
+ * Attempt to create an instance via an invokable class.
*
* Overrides parent implementation by invoking the route factory,
* passing $creationOptions as the argument.
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php
index 4e5fc91f817bf115272bfcd5de66190c5eaf4982..6dc624100e45049443a503a4aceef9da423e2c61 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php
@@ -16,7 +16,7 @@ interface RouteStackInterface extends RouteInterface
*
* @param string $name
* @param mixed $route
- * @param integer $priority
+ * @param int $priority
* @return RouteStackInterface
*/
public function addRoute($name, $route, $priority = null);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
index 8b6861b8ad0f7da28f0b692214dd182a591f76e0..25fbbae561c0445e772dbde9b1f772ce67dddbf9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -148,7 +148,7 @@ class SimpleRouteStack implements RouteStackInterface
* @see RouteStackInterface::addRoute()
* @param string $name
* @param mixed $route
- * @param integer $priority
+ * @param int $priority
* @return SimpleRouteStack
*/
public function addRoute($name, $route, $priority = null)
@@ -170,7 +170,7 @@ class SimpleRouteStack implements RouteStackInterface
* removeRoute(): defined by RouteStackInterface interface.
*
* @see RouteStackInterface::removeRoute()
- * @param string $name
+ * @param string $name
* @return SimpleRouteStack
*/
public function removeRoute($name)
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php
index 3d577cc66c3a0a15a235b919e7a7e26fd41a55b9..c01084d65d15d60d285ef8e40e8f662fe9cbec83 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php
@@ -15,9 +15,10 @@ use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
use Zend\Mvc\ResponseSender\ConsoleResponseSender;
+use Zend\Mvc\ResponseSender\HttpResponseSender;
use Zend\Mvc\ResponseSender\PhpEnvironmentResponseSender;
-use Zend\Mvc\ResponseSender\SimpleStreamResponseSender;
use Zend\Mvc\ResponseSender\SendResponseEvent;
+use Zend\Mvc\ResponseSender\SimpleStreamResponseSender;
use Zend\Stdlib\ResponseInterface as Response;
class SendResponseListener implements
@@ -125,7 +126,7 @@ class SendResponseListener implements
public function getEvent()
{
if (!$this->event instanceof SendResponseEvent) {
- $this->event = new SendResponseEvent();
+ $this->setEvent(new SendResponseEvent());
}
return $this->event;
}
@@ -160,6 +161,6 @@ class SendResponseListener implements
$events->attach(SendResponseEvent::EVENT_SEND_RESPONSE, new PhpEnvironmentResponseSender(), -1000);
$events->attach(SendResponseEvent::EVENT_SEND_RESPONSE, new ConsoleResponseSender(), -2000);
$events->attach(SendResponseEvent::EVENT_SEND_RESPONSE, new SimpleStreamResponseSender(), -3000);
+ $events->attach(SendResponseEvent::EVENT_SEND_RESPONSE, new HttpResponseSender(), -4000);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
index 57834defb58a936ce869dbcf0c3b3126bced950c..08571bd8d786147f47b6c2b8cc080e5d9e81e5f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
@@ -10,10 +10,10 @@
namespace Zend\Mvc\Service;
use stdClass;
+use Zend\Console\Adapter\AdapterInterface;
+use Zend\Console\Console;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Console\Console;
-use Zend\Console\Adapter\AdapterInterface;
class ConsoleAdapterFactory implements FactoryInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..7d884dd2305bd25fed23f40d92b78fd54986382c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+use Zend\Console\Console;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Mvc\View\Console\ViewManager as ConsoleViewManager;
+
+class ConsoleViewManagerFactory implements FactoryInterface
+{
+ /**
+ * Create and return the view manager for the console environment
+ *
+ * @param ServiceLocatorInterface $serviceLocator
+ * @return ConsoleViewManager
+ */
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ if (!Console::isConsole()) {
+ throw new ServiceNotCreatedException(
+ 'ConsoleViewManager requires a Console environment; console environment not detected'
+ );
+ }
+
+ return new ConsoleViewManager();
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
index 26e87c069db05c65dfd1f750af88a74619fbcfa5..1d043be806c2023c98504b36ce276fcab707add8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
@@ -9,13 +9,13 @@
namespace Zend\Mvc\Service;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception;
use Zend\Di\Di;
use Zend\Di\Exception\ClassNotFoundException;
use Zend\Mvc\Exception\DomainException;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\AbstractPluginManager;
+use Zend\ServiceManager\Exception;
+use Zend\ServiceManager\ServiceLocatorInterface;
class DiStrictAbstractServiceFactory extends Di implements AbstractFactoryInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php
index 0af1f063fe055bd890c842c8ab158a11ae1bbad8..2369550fff8553bfe347b1cc95bb136591dc21b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php
@@ -25,6 +25,8 @@ class FormElementManagerFactory extends AbstractPluginManagerFactory
public function createService(ServiceLocatorInterface $serviceLocator)
{
$plugins = parent::createService($serviceLocator);
+ $plugins->addPeeringServiceManager($serviceLocator);
+ $plugins->setRetrieveFromPeeringManagerFirst(true);
return $plugins;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HttpViewManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HttpViewManagerFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..fddd005f21636bca71422a995984e893b81959c1
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HttpViewManagerFactory.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Mvc\View\Http\ViewManager as HttpViewManager;
+
+class HttpViewManagerFactory implements FactoryInterface
+{
+ /**
+ * Create and return a view manager for the HTTP environment
+ *
+ * @param ServiceLocatorInterface $serviceLocator
+ * @return HttpViewManager
+ */
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ return new HttpViewManager();
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..80b4e4255c9c2bb4c27d3a0d1f5b07d7359164f8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class HydratorManagerFactory extends AbstractPluginManagerFactory
+{
+ const PLUGIN_MANAGER_CLASS = 'Zend\Stdlib\Hydrator\HydratorPluginManager';
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..c914e6b7586968715e0fe0862ce3a3e18fabf354
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class InputFilterManagerFactory extends AbstractPluginManagerFactory
+{
+ const PLUGIN_MANAGER_CLASS = 'Zend\InputFilter\InputFilterPluginManager';
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php
index f742a8c1d2318f5c7b043a70b3fec88286b6e88b..1465ac73a2c8b633dda91251b8abc52b4ffc3b8a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php
@@ -91,6 +91,24 @@ class ModuleManagerFactory implements FactoryInterface
'Zend\ModuleManager\Feature\RouteProviderInterface',
'getRouteConfig'
);
+ $serviceListener->addServiceManager(
+ 'SerializerAdapterManager',
+ 'serializers',
+ 'Zend\ModuleManager\Feature\SerializerProviderInterface',
+ 'getSerializerConfig'
+ );
+ $serviceListener->addServiceManager(
+ 'HydratorManager',
+ 'hydrators',
+ 'Zend\ModuleManager\Feature\HydratorProviderInterface',
+ 'getHydratorConfig'
+ );
+ $serviceListener->addServiceManager(
+ 'InputFilterManager',
+ 'input_filters',
+ 'Zend\ModuleManager\Feature\InputFilterProviderInterface',
+ 'getInputFilterConfig'
+ );
$events = $serviceLocator->get('EventManager');
$events->attach($defaultListeners);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php
index 02f984890bb0ad49024f824267d005ccd70a4f66..729a71ecada09ac2b6393b4c22a4134ae7123678 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php
@@ -9,9 +9,9 @@
namespace Zend\Mvc\Service;
-use Zend\Http\PhpEnvironment\Request as HttpRequest;
-use Zend\Console\Request as ConsoleRequest;
use Zend\Console\Console;
+use Zend\Console\Request as ConsoleRequest;
+use Zend\Http\PhpEnvironment\Request as HttpRequest;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php
index 59c2963cfb0ce2def1ef9e80f4f5b5ac1d54bf90..fa66f8fca5733650314b4755af05c1400dedb38b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php
@@ -9,9 +9,9 @@
namespace Zend\Mvc\Service;
-use Zend\Http\PhpEnvironment\Response as HttpResponse;
-use Zend\Console\Response as ConsoleResponse;
use Zend\Console\Console;
+use Zend\Console\Response as ConsoleResponse;
+use Zend\Http\PhpEnvironment\Response as HttpResponse;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
index ea838ff43e684efa7f2c4120370fd4d45f9d8640..7b10a90f5871f4e6d6f0f0d489cab973ef988e63 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
@@ -9,11 +9,11 @@
namespace Zend\Mvc\Service;
-use Zend\Mvc\Router\Http\TreeRouteStack as HttpRouter;
+use Zend\Console\Console;
use Zend\Mvc\Router\Console\SimpleRouteStack as ConsoleRouter;
+use Zend\Mvc\Router\Http\TreeRouteStack as HttpRouter;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Console\Console;
class RouterFactory implements FactoryInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
index 21d50150dc60a083d26e6a6f190bb70374cfb294..463dbee146fbc09ddce95929d86d7500368f4660 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
@@ -9,30 +9,7 @@
namespace Zend\Mvc\Service;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
class SerializerAdapterPluginManagerFactory extends AbstractPluginManagerFactory
{
const PLUGIN_MANAGER_CLASS = 'Zend\Serializer\AdapterPluginManager';
-
-
- /**
- * {@inheritDoc}
- */
- public function createService(ServiceLocatorInterface $serviceLocator)
- {
- /** @var $serviceListener \Zend\ModuleManager\Listener\ServiceListener */
- $serviceListener = $serviceLocator->get('ServiceListener');
-
- // This will allow to register new serializers easily, either by implementing the SerializerProviderInterface
- // in your Module.php file, or by adding the "serializers" key in your module.config.php file
- $serviceListener->addServiceManager(
- $serviceLocator,
- 'serializers',
- 'Zend\ModuleManager\Feature\SerializerProviderInterface',
- 'getSerializerConfig'
- );
-
- return parent::createService($serviceLocator);
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php
index c0459f42ec158e8b492c84c3ed1c7064ba8edda2..469b673f320c319a6ae63bfbb1c84bf29db5108b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php
@@ -9,10 +9,10 @@
namespace Zend\Mvc\Service;
-use Zend\Mvc\Exception\RuntimeException;
-use Zend\Mvc\Exception\InvalidArgumentException;
use Zend\ModuleManager\Listener\ServiceListener;
use Zend\ModuleManager\Listener\ServiceListenerInterface;
+use Zend\Mvc\Exception\InvalidArgumentException;
+use Zend\Mvc\Exception\RuntimeException;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
@@ -46,6 +46,7 @@ class ServiceListenerFactory implements FactoryInterface
'ControllerPluginManager' => 'Zend\Mvc\Service\ControllerPluginManagerFactory',
'ConsoleAdapter' => 'Zend\Mvc\Service\ConsoleAdapterFactory',
'ConsoleRouter' => 'Zend\Mvc\Service\RouterFactory',
+ 'ConsoleViewManager' => 'Zend\Mvc\Service\ConsoleViewManagerFactory',
'DependencyInjector' => 'Zend\Mvc\Service\DiFactory',
'DiAbstractServiceFactory' => 'Zend\Mvc\Service\DiAbstractServiceFactoryFactory',
'DiServiceInitializer' => 'Zend\Mvc\Service\DiServiceInitializerFactory',
@@ -53,11 +54,16 @@ class ServiceListenerFactory implements FactoryInterface
'FilterManager' => 'Zend\Mvc\Service\FilterManagerFactory',
'FormElementManager' => 'Zend\Mvc\Service\FormElementManagerFactory',
'HttpRouter' => 'Zend\Mvc\Service\RouterFactory',
+ 'HttpViewManager' => 'Zend\Mvc\Service\HttpViewManagerFactory',
+ 'HydratorManager' => 'Zend\Mvc\Service\HydratorManagerFactory',
+ 'InputFilterManager' => 'Zend\Mvc\Service\InputFilterManagerFactory',
+ 'MvcTranslator' => 'Zend\Mvc\Service\TranslatorServiceFactory',
'PaginatorPluginManager' => 'Zend\Mvc\Service\PaginatorPluginManagerFactory',
'Request' => 'Zend\Mvc\Service\RequestFactory',
'Response' => 'Zend\Mvc\Service\ResponseFactory',
'Router' => 'Zend\Mvc\Service\RouterFactory',
'RoutePluginManager' => 'Zend\Mvc\Service\RoutePluginManagerFactory',
+ 'SerializerAdapterManager' => 'Zend\Mvc\Service\SerializerAdapterPluginManagerFactory',
'ValidatorManager' => 'Zend\Mvc\Service\ValidatorManagerFactory',
'ViewHelperManager' => 'Zend\Mvc\Service\ViewHelperManagerFactory',
'ViewFeedRenderer' => 'Zend\Mvc\Service\ViewFeedRendererFactory',
@@ -80,6 +86,9 @@ class ServiceListenerFactory implements FactoryInterface
'Zend\View\Resolver\AggregateResolver' => 'ViewResolver',
'Zend\View\Resolver\ResolverInterface' => 'ViewResolver',
),
+ 'abstract_factories' => array(
+ 'Zend\Form\FormAbstractServiceFactory',
+ ),
);
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..09ad72066dfe9a2fb1a43bfcdc9b565efc96c3cf
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+use Zend\I18n\Translator\TranslatorServiceFactory as I18nTranslatorServiceFactory;
+use Zend\Mvc\I18n\Translator;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Overrides the translator factory from the i18n component in order to
+ * replace it with the bridge class from this namespace.
+ */
+class TranslatorServiceFactory extends I18nTranslatorServiceFactory
+{
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ // Configure the translator
+ $config = $serviceLocator->get('Config');
+ $trConfig = isset($config['translator']) ? $config['translator'] : array();
+ $translator = Translator::factory($trConfig);
+ return $translator;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php
index e13b4aa79106762186519bb339b6851f24caee61..0d6e266791218bc065fc47eb5e1b9ceeec2bf451 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php
@@ -18,17 +18,17 @@ use Zend\Mvc\View\Http\ViewManager as HttpViewManager;
class ViewManagerFactory implements FactoryInterface
{
/**
- * Create and return a request instance, according to current environment.
+ * Create and return a view manager based on detected environment
*
* @param ServiceLocatorInterface $serviceLocator
- * @return HttpViewManager
+ * @return ConsoleViewManager|HttpViewManager
*/
public function createService(ServiceLocatorInterface $serviceLocator)
{
if (Console::isConsole()) {
- return new ConsoleViewManager();
+ return $serviceLocator->get('ConsoleViewManager');
}
- return new HttpViewManager();
+ return $serviceLocator->get('HttpViewManager');
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php
index 9ab20c570c87c39f3a0eb0c496ed26c78e621488..981651f7942f2e63df210d19644f7e759391d11f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php
@@ -9,9 +9,9 @@
namespace Zend\Mvc\Service;
-use Zend\View\Resolver as ViewResolver;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\Resolver as ViewResolver;
class ViewResolverFactory implements FactoryInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
index 657fa1ceccf87308bf334a40beee011bacb1aa52..b49c1e65d04f4e6b1928a34d70ae9ea5262446bd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
@@ -9,9 +9,9 @@
namespace Zend\Mvc\Service;
-use Zend\View\Resolver as ViewResolver;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\Resolver as ViewResolver;
class ViewTemplateMapResolverFactory implements FactoryInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
index 533fc02ca6ae8ae4aff096e94e8f8956234600c6..ce507cac8bd3dedc493161f287e139f18950e87d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
@@ -9,9 +9,9 @@
namespace Zend\Mvc\Service;
-use Zend\View\Resolver as ViewResolver;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\Resolver as ViewResolver;
class ViewTemplatePathStackFactory implements FactoryInterface
{
@@ -19,7 +19,8 @@ class ViewTemplatePathStackFactory implements FactoryInterface
* Create the template map view resolver
*
* Creates a Zend\View\Resolver\TemplatePathStack and populates it with the
- * ['view_manager']['template_path_stack']
+ * ['view_manager']['template_path_stack'] and sets the default suffix with the
+ * ['view_manager']['default_template_suffix']
*
* @param ServiceLocatorInterface $serviceLocator
* @return ViewResolver\TemplatePathStack
@@ -27,16 +28,21 @@ class ViewTemplatePathStackFactory implements FactoryInterface
public function createService(ServiceLocatorInterface $serviceLocator)
{
$config = $serviceLocator->get('Config');
- $stack = array();
+
+ $templatePathStack = new ViewResolver\TemplatePathStack();
+
if (is_array($config) && isset($config['view_manager'])) {
$config = $config['view_manager'];
- if (is_array($config) && isset($config['template_path_stack'])) {
- $stack = $config['template_path_stack'];
+ if (is_array($config)) {
+ if (isset($config['template_path_stack'])) {
+ $templatePathStack->addPaths($config['template_path_stack']);
+ }
+ if (isset($config['default_template_suffix'])) {
+ $templatePathStack->setDefaultSuffix($config['default_template_suffix']);
+ }
}
}
- $templatePathStack = new ViewResolver\TemplatePathStack();
- $templatePathStack->addPaths($stack);
return $templatePathStack;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
index d76482ddea73a67c4e9801a769f975765810c025..0adbd7bf2a0bf94c31132327ce1a25ae1f93f36e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
@@ -18,26 +18,16 @@
namespace Zend\Mvc\View\Console;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface as Events;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ArrayUtils;
use Zend\View\Model\ConsoleModel;
-class CreateViewModelListener implements ListenerAggregateInterface
+class CreateViewModelListener extends AbstractListenerAggregate
{
/**
- * Listeners we've registered
- *
- * @var array
- */
- protected $listeners = array();
-
- /**
- * Attach listeners
- *
- * @param Events $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(Events $events)
{
@@ -46,22 +36,6 @@ class CreateViewModelListener implements ListenerAggregateInterface
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'createViewModelFromNull'), -80);
}
- /**
- * Detach listeners
- *
- * @param Events $events
- * @return void
- */
- public function detach(Events $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
-
/**
* Inspect the result, and cast it to a ViewModel if a string is detected
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
index ec0299e3083558293171cd98b9c96098c21855cf..4fd597f4d0dbd41ddfa18aa18ec0a7282c36eb77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
@@ -9,47 +9,24 @@
namespace Zend\Mvc\View\Console;
+use Zend\Console\Response as ConsoleResponse;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ResponseInterface as Response;
-use Zend\Console\Response as ConsoleResponse;
use Zend\View\Model\ConsoleModel as ConsoleViewModel;
-use Zend\View\Model\ModelInterface as ViewModel;
-class DefaultRenderingStrategy implements ListenerAggregateInterface
+class DefaultRenderingStrategy extends AbstractListenerAggregate
{
/**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
- /**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER, array($this, 'render'), -10000);
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Render the view
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
index efd96cc59dddc13244ea2ec9cbfd629aa1761ad5..d2fe957f784be805fe8e0d917362f508a6d333f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
@@ -9,14 +9,14 @@
namespace Zend\Mvc\View\Console;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\Application;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ResponseInterface as Response;
use Zend\View\Model\ConsoleModel;
-class ExceptionStrategy implements ListenerAggregateInterface
+class ExceptionStrategy extends AbstractListenerAggregate
{
/**
* Display exceptions?
@@ -45,15 +45,7 @@ class ExceptionStrategy implements ListenerAggregateInterface
EOT;
/**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
- /**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
@@ -61,21 +53,6 @@ EOT;
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, array($this, 'prepareExceptionViewModel'));
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Flag: display exceptions in error pages?
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
index a2164dcd7f7630b0186e6b0379bb1cb786fddd20..39901af241b407687b583002a0ecf61d1671b245 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
@@ -9,47 +9,21 @@
namespace Zend\Mvc\View\Console;
+use Zend\Console\Request as ConsoleRequest;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface as Events;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
-use Zend\Console\Request as ConsoleRequest;
-class InjectNamedConsoleParamsListener implements ListenerAggregateInterface
+class InjectNamedConsoleParamsListener extends AbstractListenerAggregate
{
/**
- * Listeners we've registered
- *
- * @var array
- */
- protected $listeners = array();
-
- /**
- * Attach listeners
- *
- * @param Events $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(Events $events)
{
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'injectNamedParams'), -80);
}
- /**
- * Detach listeners
- *
- * @param Events $events
- * @return void
- */
- public function detach(Events $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
-
/**
* Inspect the result, and cast it to a ViewModel if a string is detected
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php
index 3af9a606d7e3e9becb17cabcac6ed2d3525e9b25..18ec885916ec716fa9b33f57fe7905321f983a9b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php
@@ -12,5 +12,5 @@ namespace Zend\Mvc\View\Console;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\View\Http\InjectViewModelListener as HttpInjectViewModelListener;
-class InjectViewModelListener extends HttpInjectViewModelListener implements ListenerAggregateInterface
+class InjectViewModelListener extends HttpInjectViewModelListener
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
index 6fa34a19e1eba88be2c2a011e05c16f56a8e17dc..f3bf9a52b9ffd9c195ae03bc283bcd533d3f77dd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
@@ -13,6 +13,7 @@ use Zend\Console\Adapter\AdapterInterface as ConsoleAdapter;
use Zend\Console\ColorInterface;
use Zend\Console\Response as ConsoleResponse;
use Zend\Console\Request as ConsoleRequest;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\ModuleManager\ModuleManagerInterface;
@@ -29,13 +30,8 @@ use Zend\Text\Table;
use Zend\Version\Version;
use Zend\View\Model\ConsoleModel;
-class RouteNotFoundStrategy implements ListenerAggregateInterface
+class RouteNotFoundStrategy extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* Whether or not to display the reason for routing failure
*
@@ -51,31 +47,13 @@ class RouteNotFoundStrategy implements ListenerAggregateInterface
protected $reason = false;
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($this, 'handleRouteNotFoundError'));
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Set flag indicating whether or not to display the routing failure
*
@@ -184,7 +162,7 @@ class RouteNotFoundStrategy implements ListenerAggregateInterface
$banner = $this->getConsoleBanner($console, $mm);
// Get application usage information
- $usage = $this->getConsoleUsage($console, $scriptName, $mm, $router);
+ $usage = $this->getConsoleUsage($console, $scriptName, $mm);
// Inject the text into view
$result = $banner ? rtrim($banner, "\r\n") : '';
@@ -221,8 +199,14 @@ class RouteNotFoundStrategy implements ListenerAggregateInterface
continue; // this module does not provide a banner
}
+ // Don't render empty completely empty lines
+ $banner = $module->getConsoleBanner($console);
+ if ($banner == '') {
+ continue;
+ }
+
// We colorize each banners in blue for visual emphasis
- $banners[] = $console->colorize($module->getConsoleBanner($console), ColorInterface::BLUE);
+ $banners[] = $console->colorize($banner, ColorInterface::BLUE);
}
}
@@ -281,10 +265,10 @@ class RouteNotFoundStrategy implements ListenerAggregateInterface
$usage = $module->getConsoleUsage($console);
// Normalize what we got from the module or discard
- if (is_array($usage)) {
+ if (is_array($usage) && !empty($usage)) {
array_unshift($usage, $moduleName);
$usageInfo[$name] = $usage;
- } elseif (is_string($usage)) {
+ } elseif (is_string($usage) && ($usage != '')) {
$usageInfo[$name] = array($moduleName, $usage);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php
index ea625082000eefd92f96fc259d6966e4b2419e88..8bffadb0f282bd1e5c935f28f558db5c2b6ff291 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php
@@ -9,26 +9,16 @@
namespace Zend\Mvc\View\Http;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface as Events;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ArrayUtils;
use Zend\View\Model\ViewModel;
-class CreateViewModelListener implements ListenerAggregateInterface
+class CreateViewModelListener extends AbstractListenerAggregate
{
/**
- * Listeners we've registered
- *
- * @var array
- */
- protected $listeners = array();
-
- /**
- * Attach listeners
- *
- * @param Events $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(Events $events)
{
@@ -36,21 +26,6 @@ class CreateViewModelListener implements ListenerAggregateInterface
$this->listeners[] = $events->attach('dispatch', array($this, 'createViewModelFromNull'), -80);
}
- /**
- * Detach listeners
- *
- * @param Events $events
- * @return void
- */
- public function detach(Events $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Inspect the result, and cast it to a ViewModel if an assoc array is detected
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
index 7ad5111e85787f9321d257e1d98b626e4e1e1ac8..37269cccc832c0e3277b5d17c2fcbab5d6a01626 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
@@ -9,21 +9,16 @@
namespace Zend\Mvc\View\Http;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\Application;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ResponseInterface as Response;
use Zend\View\Model\ModelInterface as ViewModel;
use Zend\View\View;
-class DefaultRenderingStrategy implements ListenerAggregateInterface
+class DefaultRenderingStrategy extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* Layout template - template used in root ViewModel of MVC event.
*
@@ -45,14 +40,10 @@ class DefaultRenderingStrategy implements ListenerAggregateInterface
public function __construct(View $view)
{
$this->view = $view;
- return $this;
}
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
@@ -60,21 +51,6 @@ class DefaultRenderingStrategy implements ListenerAggregateInterface
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, array($this, 'render'), -10000);
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Set layout template value
*
@@ -124,7 +100,7 @@ class DefaultRenderingStrategy implements ListenerAggregateInterface
try {
$view->render($viewModel);
- } catch(\Exception $ex) {
+ } catch (\Exception $ex) {
if ($e->getName() === MvcEvent::EVENT_RENDER_ERROR) {
throw $ex;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php
index 6c7e3e4402edd5843c55f1d54ab0c75d4480872b..bb81fd810900be8731a0e5d68d0b8e35f4254908 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php
@@ -9,15 +9,15 @@
namespace Zend\Mvc\View\Http;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Http\Response as HttpResponse;
use Zend\Mvc\Application;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ResponseInterface as Response;
use Zend\View\Model\ViewModel;
-class ExceptionStrategy implements ListenerAggregateInterface
+class ExceptionStrategy extends AbstractListenerAggregate
{
/**
* Display exceptions?
@@ -32,15 +32,7 @@ class ExceptionStrategy implements ListenerAggregateInterface
protected $exceptionTemplate = 'error';
/**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
- /**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
@@ -48,21 +40,6 @@ class ExceptionStrategy implements ListenerAggregateInterface
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, array($this, 'prepareExceptionViewModel'));
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Flag: display exceptions in error pages?
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
index 60de1850537b6d792074a842f89a16cc36101846..d1403876b605e1394d771a1f52b906a89ffeaecb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
@@ -9,19 +9,14 @@
namespace Zend\Mvc\View\Http;
+use Zend\Console\Request as ConsoleRequest;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Http\Request as HttpRequest;
-use Zend\Console\Request as ConsoleRequest;
use Zend\Mvc\MvcEvent;
-class InjectRoutematchParamsListener implements ListenerAggregateInterface
+class InjectRoutematchParamsListener extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* Should request params overwrite existing request params?
*
@@ -30,31 +25,13 @@ class InjectRoutematchParamsListener implements ListenerAggregateInterface
protected $overwrite = true;
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
$this->listeners[] = $events->attach('dispatch', array($this, 'injectParams'), 90);
}
- /**
- * Detach listeners
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Take parameters from RouteMatch and inject them into the request.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php
index d94df97e0eab560a63cd66d7805949137100035e..7aacfa1b9e42ac6c7dc404222eaee8b89a9f75c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php
@@ -9,14 +9,14 @@
namespace Zend\Mvc\View\Http;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface as Events;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Filter\Word\CamelCaseToDash as CamelCaseToDashFilter;
use Zend\Mvc\MvcEvent;
use Zend\Mvc\ModuleRouteListener;
use Zend\View\Model\ModelInterface as ViewModel;
-class InjectTemplateListener implements ListenerAggregateInterface
+class InjectTemplateListener extends AbstractListenerAggregate
{
/**
* FilterInterface/inflector used to normalize names for use as template identifiers
@@ -26,38 +26,13 @@ class InjectTemplateListener implements ListenerAggregateInterface
protected $inflector;
/**
- * Listeners we've registered
- *
- * @var array
- */
- protected $listeners = array();
-
- /**
- * Attach listeners
- *
- * @param Events $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(Events $events)
{
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'injectTemplate'), -90);
}
- /**
- * Detach listeners
- *
- * @param Events $events
- * @return void
- */
- public function detach(Events $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Inject a template into the view model, if none present
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php
index d03fd4dd9d8d42430a778f47982409a3a0579328..770e4746e89d95ac86d3bd79550e10fe21f5359e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php
@@ -9,13 +9,13 @@
namespace Zend\Mvc\View\Http;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface as Events;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
use Zend\View\Model\ClearableModelInterface;
use Zend\View\Model\ModelInterface as ViewModel;
-class InjectViewModelListener implements ListenerAggregateInterface
+class InjectViewModelListener extends AbstractListenerAggregate
{
/**
* FilterInterface/inflector used to normalize names for use as template identifiers
@@ -25,17 +25,7 @@ class InjectViewModelListener implements ListenerAggregateInterface
protected $inflector;
/**
- * Listeners we've registered
- *
- * @var array
- */
- protected $listeners = array();
-
- /**
- * Attach listeners
- *
- * @param Events $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(Events $events)
{
@@ -44,21 +34,6 @@ class InjectViewModelListener implements ListenerAggregateInterface
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, array($this, 'injectViewModel'), -100);
}
- /**
- * Detach listeners
- *
- * @param Events $events
- * @return void
- */
- public function detach(Events $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Insert the view model into the event
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
index 4b3e86b3ad4d6cde46f7ea87968110daea33b25b..0fde9b68f40ed53d5c509f4ae1138a6b3b399171 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
@@ -9,21 +9,16 @@
namespace Zend\Mvc\View\Http;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Http\Response as HttpResponse;
use Zend\Mvc\Application;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ResponseInterface as Response;
use Zend\View\Model\ViewModel;
-class RouteNotFoundStrategy implements ListenerAggregateInterface
+class RouteNotFoundStrategy extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* Whether or not to display exceptions related to the 404 condition
*
@@ -53,10 +48,7 @@ class RouteNotFoundStrategy implements ListenerAggregateInterface
protected $reason = false;
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
@@ -87,21 +79,6 @@ class RouteNotFoundStrategy implements ListenerAggregateInterface
return $this->displayExceptions;
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Set value indicating whether or not to display the reason for a not-found condition
*
@@ -216,7 +193,7 @@ class RouteNotFoundStrategy implements ListenerAggregateInterface
$model->setTemplate($this->getNotFoundTemplate());
// If displaying reasons, inject the reason
- $this->injectNotFoundReason($model, $e);
+ $this->injectNotFoundReason($model);
// If displaying exceptions, inject
$this->injectException($model, $e);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php
index c9b04b1353298913d3b87ecece7dfe27b9f3f241..0355347bf8eeb455b31f9ffd68daf7c5103f9a8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php
@@ -11,6 +11,7 @@ namespace Zend\Mvc\View\Http;
use ArrayAccess;
use Traversable;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
@@ -44,13 +45,8 @@ use Zend\View\View;
* - RouteNotFoundStrategy (also aliased to Zend\Mvc\View\Http\RouteNotFoundStrategy and 404Strategy)
* - ViewModel
*/
-class ViewManager implements ListenerAggregateInterface
+class ViewManager extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* @var object application configuration service
*/
@@ -82,10 +78,7 @@ class ViewManager implements ListenerAggregateInterface
/**@-*/
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json b/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
index 05b078e377377cb19ca409b0b211203e858c5081..75b048c369c1e2e6f20cb8129e1cde2f1a234268 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
@@ -27,10 +27,13 @@
"zendframework/zend-text": "self.version",
"zendframework/zend-view": "self.version"
},
+ "suggest": {
+ "zendframework/zend-i18n": "Zend\\I18n component for translatable segments"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
index 0fb97fae9cc57ee323fb4e3d90a75af12a43b8a0..1f5023a6b58073cbd2788f189de4e71071a17bb0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
@@ -108,6 +108,13 @@ abstract class AbstractPage extends AbstractContainer
*/
protected $privilege;
+ /**
+ * Permission associated with this page
+ *
+ * @var string|null
+ */
+ protected $permission;
+
/**
* Whether this page should be considered active
*
@@ -700,6 +707,31 @@ abstract class AbstractPage extends AbstractContainer
return $this->privilege;
}
+ /**
+ * Sets permission associated with this page
+ *
+ * @param string|null $permission [optional] permission to associate
+ * with this page. Default is null, which
+ * sets no permission.
+ *
+ * @return AbstractPage fluent interface, returns self
+ */
+ public function setPermission($permission = null)
+ {
+ $this->permission = is_string($permission) ? $permission : null;
+ return $this;
+ }
+
+ /**
+ * Returns permission associated with this page
+ *
+ * @return string|null permission or null
+ */
+ public function getPermission()
+ {
+ return $this->permission;
+ }
+
/**
* Sets whether page should be considered active or not
*
@@ -1127,6 +1159,7 @@ abstract class AbstractPage extends AbstractContainer
'order' => $this->getOrder(),
'resource' => $this->getResource(),
'privilege' => $this->getPrivilege(),
+ 'permission' => $this->getPermission(),
'active' => $this->isActive(),
'visible' => $this->isVisible(),
'type' => get_class($this),
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
index 1267f4d939787285362d20d739c831941e7ecd04..a7509c0208b5571e08d951d7cd0cd6f2588d35c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
@@ -9,10 +9,10 @@
namespace Zend\Navigation\Page;
+use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\Router\RouteMatch;
use Zend\Mvc\Router\RouteStackInterface;
use Zend\Navigation\Exception;
-use Zend\Mvc\ModuleRouteListener;
/**
* Represents a page that is defined using controller, action, route
@@ -75,6 +75,13 @@ class Mvc extends AbstractPage
*/
protected $routeMatch;
+ /**
+ * If true and set routeMatch than getHref will use routeMatch params
+ * to assemble uri
+ * @var bool
+ */
+ protected $useRouteMatch = false;
+
/**
* Router for assembling URLs
*
@@ -190,7 +197,7 @@ class Mvc extends AbstractPage
);
}
- if ($this->getRouteMatch() !== null) {
+ if ($this->useRouteMatch()) {
$rmParams = $this->getRouteMatch()->getParams();
if (isset($rmParams[ModuleRouteListener::ORIGINAL_CONTROLLER])) {
@@ -427,6 +434,30 @@ class Mvc extends AbstractPage
return $this;
}
+ /**
+ * Get the useRouteMatch flag
+ *
+ * @return bool
+ */
+ public function useRouteMatch()
+ {
+ return $this->useRouteMatch;
+ }
+
+ /**
+ * Set whether the page should use route match params for assembling link uri
+ *
+ * @see getHref()
+ * @param bool $useRouteMatch [optional]
+ * @return Mvc
+ */
+ public function setUseRouteMatch($useRouteMatch = true)
+ {
+ $this->useRouteMatch = (bool) $useRouteMatch;
+ $this->hrefCache = null;
+ return $this;
+ }
+
/**
* Get the router.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json b/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json
index 7ee10fb64af7cba597f513bb1c4ca4f330c3404f..b395d0ad2190926365233ac2e431efb6cb0091a1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json
@@ -23,8 +23,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php
index aca8c9579ab970a309cfb9fda8f621dbb2260983..daa08dc6eb39d22fa137080fbbdd239197a02b37 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php
@@ -19,8 +19,8 @@ interface AdapterInterface extends Countable
/**
* Returns an collection of items for a page.
*
- * @param integer $offset Page offset
- * @param integer $itemCountPerPage Number of items per page
+ * @param int $offset Page offset
+ * @param int $itemCountPerPage Number of items per page
* @return array
*/
public function getItems($offset, $itemCountPerPage);
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php
index 262cc565ad8188150639884957efef7ee4a41b78..55ccb83056d29bcd7dd615f603c741d658dfe727 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php
@@ -21,7 +21,7 @@ class ArrayAdapter implements AdapterInterface
/**
* Item count
*
- * @var integer
+ * @var int
*/
protected $count = null;
@@ -39,8 +39,8 @@ class ArrayAdapter implements AdapterInterface
/**
* Returns an array of items for a page.
*
- * @param integer $offset Page offset
- * @param integer $itemCountPerPage Number of items per page
+ * @param int $offset Page offset
+ * @param int $itemCountPerPage Number of items per page
* @return array
*/
public function getItems($offset, $itemCountPerPage)
@@ -51,7 +51,7 @@ class ArrayAdapter implements AdapterInterface
/**
* Returns the total number of rows in the array.
*
- * @return integer
+ * @return int
*/
public function count()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
index 3919de15a91d4b71ae8ee9e397b1cc51d9335239..92c7b532810cd2e31a090e93c8dacd4fbca5ca5c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
@@ -13,8 +13,8 @@ use Zend\Db\Adapter\Adapter;
use Zend\Db\Sql\Sql;
use Zend\Db\Sql\Expression;
use Zend\Db\Sql\Select;
-use Zend\Db\ResultSet\ResultSetInterface;
use Zend\Db\ResultSet\ResultSet;
+use Zend\Db\ResultSet\ResultSetInterface;
class DbSelect implements AdapterInterface
{
@@ -39,7 +39,7 @@ class DbSelect implements AdapterInterface
/**
* Total item count
*
- * @var integer
+ * @var int
*/
protected $rowCount = null;
@@ -72,8 +72,8 @@ class DbSelect implements AdapterInterface
/**
* Returns an array of items for a page.
*
- * @param integer $offset Page offset
- * @param integer $itemCountPerPage Number of items per page
+ * @param int $offset Page offset
+ * @param int $itemCountPerPage Number of items per page
* @return array
*/
public function getItems($offset, $itemCountPerPage)
@@ -94,7 +94,7 @@ class DbSelect implements AdapterInterface
/**
* Returns the total number of rows in the result set.
*
- * @return integer
+ * @return int
*/
public function count()
{
@@ -115,7 +115,7 @@ class DbSelect implements AdapterInterface
foreach ($joins as $join) {
$select->join($join['name'], $join['on'], array(), $join['type']);
}
-
+
$select->columns(array('c' => new Expression('COUNT(1)')));
$statement = $this->sql->prepareStatementForSqlObject($select);
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php
new file mode 100644
index 0000000000000000000000000000000000000000..b667ee0e3d5c3a6c4eddeefe0e067079e7ffc525
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Paginator\Adapter;
+
+use Zend\Db\Sql\Where;
+use Zend\Db\TableGateway\TableGateway;
+use Zend\Paginator\Adapter\DbSelect;
+
+class DbTableGateway extends DbSelect
+{
+ /**
+ * Constructs instance.
+ *
+ * @param TableGateway $tableGateway
+ * @param Where|\Closure|string|array $where
+ * @param null $order
+ */
+ public function __construct(TableGateway $tableGateway, $where = null, $order = null)
+ {
+ $select = $tableGateway->getSql()->select();
+ if ($where) {
+ $select->where($where);
+ }
+ if ($order) {
+ $select->order($order);
+ }
+
+ $dbAdapter = $tableGateway->getAdapter();
+ $resultSetPrototype = $tableGateway->getResultSetPrototype();
+
+ parent::__construct($select, $dbAdapter, $resultSetPrototype);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php
index eacde19ce8c806668d3278001f9bc8ac520b982b..addc109ab415dd34ab731e73b200e1dbc1cb8d4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php
@@ -23,7 +23,7 @@ class Iterator implements AdapterInterface
/**
* Item count
*
- * @var integer
+ * @var int
*/
protected $count = null;
@@ -46,8 +46,8 @@ class Iterator implements AdapterInterface
/**
* Returns an iterator of items for a page, or an empty array.
*
- * @param integer $offset Page offset
- * @param integer $itemCountPerPage Number of items per page
+ * @param int $offset Page offset
+ * @param int $itemCountPerPage Number of items per page
* @return array|\Zend\Paginator\SerializableLimitIterator
*/
public function getItems($offset, $itemCountPerPage)
@@ -61,7 +61,7 @@ class Iterator implements AdapterInterface
/**
* Returns the total number of rows in the collection.
*
- * @return integer
+ * @return int
*/
public function count()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php
index 5b5d4abe47b8b397f4456dfbf9d9bf161869603c..e7e075ed0537555ac5526950d8d8d4a6a588f183 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php
@@ -14,14 +14,14 @@ class Null implements AdapterInterface
/**
* Item count
*
- * @var integer
+ * @var int
*/
protected $count = null;
/**
* Constructor.
*
- * @param integer $count Total item count (Optional)
+ * @param int $count Total item count (Optional)
*/
public function __construct($count = 0)
{
@@ -31,8 +31,8 @@ class Null implements AdapterInterface
/**
* Returns an array of items for a page.
*
- * @param integer $offset Page offset
- * @param integer $itemCountPerPage Number of items per page
+ * @param int $offset Page offset
+ * @param int $itemCountPerPage Number of items per page
* @return array
*/
public function getItems($offset, $itemCountPerPage)
@@ -50,7 +50,7 @@ class Null implements AdapterInterface
/**
* Returns the total number of rows in the array.
*
- * @return integer
+ * @return int
*/
public function count()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php
index cc3911bf4247473d827b69ed6a190edd64c6aa91..939a3fe5189884369308c0a9c5cea8ee449da2b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php
@@ -91,7 +91,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Number of items in the current page
*
- * @var integer
+ * @var int
*/
protected $currentItemCount = null;
@@ -105,7 +105,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Current page number (starting from 1)
*
- * @var integer
+ * @var int
*/
protected $currentPageNumber = 1;
@@ -119,14 +119,14 @@ class Paginator implements Countable, IteratorAggregate
/**
* Number of items per page
*
- * @var integer
+ * @var int
*/
protected $itemCountPerPage = null;
/**
* Number of pages
*
- * @var integer
+ * @var int
*/
protected $pageCount = null;
@@ -134,7 +134,7 @@ class Paginator implements Countable, IteratorAggregate
* Number of local pages (i.e., the number of discrete page numbers
* that will be displayed, including the current page number)
*
- * @var integer
+ * @var int
*/
protected $pageRange = 10;
@@ -335,7 +335,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the number of pages.
*
- * @return integer
+ * @return int
*/
public function count()
{
@@ -349,7 +349,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the total number of items available.
*
- * @return integer
+ * @return int
*/
public function getTotalItemCount()
{
@@ -390,9 +390,9 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the absolute item number for the specified item.
*
- * @param integer $relativeItemNumber Relative item number
- * @param integer $pageNumber Page number
- * @return integer
+ * @param int $relativeItemNumber Relative item number
+ * @param int $pageNumber Page number
+ * @return int
*/
public function getAbsoluteItemNumber($relativeItemNumber, $pageNumber = null)
{
@@ -420,7 +420,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the number of items for the current page.
*
- * @return integer
+ * @return int
*/
public function getCurrentItemCount()
{
@@ -448,7 +448,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the current page number.
*
- * @return integer
+ * @return int
*/
public function getCurrentPageNumber()
{
@@ -458,12 +458,12 @@ class Paginator implements Countable, IteratorAggregate
/**
* Sets the current page number.
*
- * @param integer $pageNumber Page number
+ * @param int $pageNumber Page number
* @return Paginator $this
*/
public function setCurrentPageNumber($pageNumber)
{
- $this->currentPageNumber = (integer) $pageNumber;
+ $this->currentPageNumber = (int) $pageNumber;
$this->currentItems = null;
$this->currentItemCount = null;
@@ -497,8 +497,8 @@ class Paginator implements Countable, IteratorAggregate
* Returns an item from a page. The current page is used if there's no
* page specified.
*
- * @param integer $itemNumber Item number (1 to itemCountPerPage)
- * @param integer $pageNumber
+ * @param int $itemNumber Item number (1 to itemCountPerPage)
+ * @param int $pageNumber
* @throws Exception\InvalidArgumentException
* @return mixed
*/
@@ -534,7 +534,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the number of items per page.
*
- * @return integer
+ * @return int
*/
public function getItemCountPerPage()
{
@@ -548,12 +548,12 @@ class Paginator implements Countable, IteratorAggregate
/**
* Sets the number of items per page.
*
- * @param integer $itemCountPerPage
+ * @param int $itemCountPerPage
* @return Paginator $this
*/
public function setItemCountPerPage($itemCountPerPage = -1)
{
- $this->itemCountPerPage = (integer) $itemCountPerPage;
+ $this->itemCountPerPage = (int) $itemCountPerPage;
if ($this->itemCountPerPage < 1) {
$this->itemCountPerPage = $this->getTotalItemCount();
}
@@ -568,7 +568,7 @@ class Paginator implements Countable, IteratorAggregate
* Returns the number of items in a collection.
*
* @param mixed $items Items
- * @return integer
+ * @return int
*/
public function getItemCount($items)
{
@@ -586,7 +586,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the items for a given page.
*
- * @param integer $pageNumber
+ * @param int $pageNumber
* @return mixed
*/
public function getItemsByPage($pageNumber)
@@ -641,7 +641,7 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns the page range (see property declaration above).
*
- * @return integer
+ * @return int
*/
public function getPageRange()
{
@@ -651,12 +651,12 @@ class Paginator implements Countable, IteratorAggregate
/**
* Sets the page range (see property declaration above).
*
- * @param integer $pageRange
+ * @param int $pageRange
* @return Paginator $this
*/
public function setPageRange($pageRange)
{
- $this->pageRange = (integer) $pageRange;
+ $this->pageRange = (int) $pageRange;
return $this;
}
@@ -679,8 +679,8 @@ class Paginator implements Countable, IteratorAggregate
/**
* Returns a subset of pages within a given range.
*
- * @param integer $lowerBound Lower bound of the range
- * @param integer $upperBound Upper bound of the range
+ * @param int $lowerBound Lower bound of the range
+ * @param int $upperBound Upper bound of the range
* @return array
*/
public function getPagesInRange($lowerBound, $upperBound)
@@ -753,12 +753,12 @@ class Paginator implements Countable, IteratorAggregate
/**
* Brings the item number in range of the page.
*
- * @param integer $itemNumber
- * @return integer
+ * @param int $itemNumber
+ * @return int
*/
public function normalizeItemNumber($itemNumber)
{
- $itemNumber = (integer) $itemNumber;
+ $itemNumber = (int) $itemNumber;
if ($itemNumber < 1) {
$itemNumber = 1;
@@ -774,12 +774,12 @@ class Paginator implements Countable, IteratorAggregate
/**
* Brings the page number in range of the paginator.
*
- * @param integer $pageNumber
- * @return integer
+ * @param int $pageNumber
+ * @return int
*/
public function normalizePageNumber($pageNumber)
{
- $pageNumber = (integer) $pageNumber;
+ $pageNumber = (int) $pageNumber;
if ($pageNumber < 1) {
$pageNumber = 1;
@@ -874,11 +874,11 @@ class Paginator implements Countable, IteratorAggregate
/**
* Calculates the page count.
*
- * @return integer
+ * @return int
*/
protected function _calculatePageCount()
{
- return (integer) ceil($this->getAdapter()->count() / $this->getItemCountPerPage());
+ return (int) ceil($this->getAdapter()->count() / $this->getItemCountPerPage());
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php
index 1e14e710c08a535f32736980ebea92d56dd608c6..7ce226727f33e7cce9aec44b7e8f6cf6a0821968 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php
@@ -22,7 +22,7 @@ class All implements ScrollingStyleInterface
* Returns an array of all pages given a page number and range.
*
* @param Paginator $paginator
- * @param integer $pageRange Unused
+ * @param int $pageRange Unused
* @return array
*/
public function getPages(Paginator $paginator, $pageRange = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php
index fabfb87a21045b4c10bf3ebda6dfbab4f38a5573..3a3947b91902497062edb944851880a1b13311e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php
@@ -24,7 +24,7 @@ class Elastic extends Sliding
* Returns an array of "local" pages given a page number and range.
*
* @param Paginator $paginator
- * @param integer $pageRange Unused
+ * @param int $pageRange Unused
* @return array
*/
public function getPages(Paginator $paginator, $pageRange = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php
index 4697ee9db7d328fc2e1d7b170b615aeff830b8de..96e1079faccda051b2e9b9ecd80a40c65d6eeef6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php
@@ -22,7 +22,7 @@ class Jumping implements ScrollingStyleInterface
* Returns an array of "local" pages given a page number and range.
*
* @param Paginator $paginator
- * @param integer $pageRange Unused
+ * @param int $pageRange Unused
* @return array
*/
public function getPages(Paginator $paginator, $pageRange = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
index 56641135c435c910917df705d1410921c968b428..0daa6140ba3fdb101a1784669149a7a26672e112 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
@@ -17,7 +17,7 @@ interface ScrollingStyleInterface
* Returns an array of "local" pages given a page number and range.
*
* @param Paginator $paginator
- * @param integer $pageRange (Optional) Page range
+ * @param int $pageRange (Optional) Page range
* @return array
*/
public function getPages(Paginator $paginator, $pageRange = null);
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php
index 1f241b7daa7423a1624f0d37eb1d069737d76a4f..e75edc65c302968c2e2af7aefd332c0eaf999c3e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php
@@ -25,7 +25,7 @@ class Sliding implements ScrollingStyleInterface
* Returns an array of "local" pages given a page number and range.
*
* @param Paginator $paginator
- * @param integer $pageRange (Optional) Page range
+ * @param int $pageRange (Optional) Page range
* @return array
*/
public function getPages(Paginator $paginator, $pageRange = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json b/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json
index abaaf42c84c4699b8221a4ccedd7ff6ec8eb7033..cdfe4a8f63fc5b445b37a7026da6ebfc4aa85af3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
index 32456d4a6597cdf166dd956a258a74d21d3f4874..40dc29283dbf15be44204faa5984ed6f8caca173 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
@@ -17,7 +17,7 @@ interface AclInterface
* The $resource parameter can either be a Resource or a Resource identifier.
*
* @param Resource\ResourceInterface|string $resource
- * @return boolean
+ * @return bool
*/
public function hasResource($resource);
@@ -45,7 +45,7 @@ interface AclInterface
* @param Role\RoleInterface|string $role
* @param Resource\ResourceInterface|string $resource
* @param string $privilege
- * @return boolean
+ * @return bool
*/
public function isAllowed($role = null, $resource = null, $privilege = null);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json
index ff54dc82feb88d43eb464016f31eb87597cbf831..5eeacc35eb7e46e2794010e57c7d32c9bd96a923 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json
@@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php
index df9c8f86c691181ecf60cfe766c48c1cb5628c62..4f922ec16196ffaedd65eeb50a35bf1df296b9fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php
@@ -53,7 +53,7 @@ abstract class AbstractIterator implements RecursiveIterator
* (PHP 5 >= 5.0.0)<br/>
* Checks if current position is valid
* @link http://php.net/manual/en/iterator.valid.php
- * @return boolean The return value will be casted to boolean and then evaluated.
+ * @return bool The return value will be casted to boolean and then evaluated.
* Returns true on success or false on failure.
*/
public function valid()
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php
index b27e068f07e22c55ef38006ce8c020bb90bc7d5b..b94e0aa56a22e37aaeb89d366263e5146f730b67 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php
@@ -15,7 +15,7 @@ interface AssertionInterface
* Assertion method - must return a boolean.
*
* @param Rbac $rbac
- * @return boolean
+ * @return bool
*/
public function assert(Rbac $rbac);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php
index 91880b7eebc0144696b55e9fbdf8d52f0f083b83..d13978122b533db171f0feadd8ab3e4b8d72d56f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php
@@ -22,7 +22,7 @@ class Rbac extends AbstractIterator
protected $createMissingRoles = false;
/**
- * @param boolean $createMissingRoles
+ * @param bool $createMissingRoles
* @return \Zend\Permissions\Rbac\Rbac
*/
public function setCreateMissingRoles($createMissingRoles)
@@ -33,7 +33,7 @@ class Rbac extends AbstractIterator
}
/**
- * @return boolean
+ * @return bool
*/
public function getCreateMissingRoles()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json
index f210df8d76e16142df8f7cf8e533ab62f2f7006e..e06dc227bbeb69c51b20ace86d51c06f78428e05 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json
@@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
index b267069e7a8ef2422c02570b1ea77934c931b4ce..715ad586aadc9b443535568c8fb3e47b59e0b8c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
@@ -73,8 +73,8 @@ abstract class AbstractAdapter
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
- * @param integer $timeTaken Taken time in seconds
- * @param integer $timeRemaining Remaining time in seconds
+ * @param int $timeTaken Taken time in seconds
+ * @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
index 4accd753ddff4c02ffbf20f8ea0d00c949c95ee2..d985a640dead35c2a92111c246622b23be2d479b 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
@@ -57,7 +57,7 @@ class Console extends AbstractAdapter
/**
* Width of the progressbar
*
- * @var integer
+ * @var int
*/
protected $width = null;
@@ -66,9 +66,11 @@ class Console extends AbstractAdapter
*
* @var array
*/
- protected $elements = array(self::ELEMENT_PERCENT,
- self::ELEMENT_BAR,
- self::ELEMENT_ETA);
+ protected $elements = array(
+ self::ELEMENT_PERCENT,
+ self::ELEMENT_BAR,
+ self::ELEMENT_ETA,
+ );
/**
* Which action to do at finish call
@@ -80,7 +82,7 @@ class Console extends AbstractAdapter
/**
* Width of the bar element
*
- * @var integer
+ * @var int
*/
protected $barWidth;
@@ -204,12 +206,12 @@ class Console extends AbstractAdapter
/**
* Set the width of the progressbar
*
- * @param integer $width
+ * @param int $width
* @return \Zend\ProgressBar\Adapter\Console
*/
public function setWidth($width = null)
{
- if ($width === null || !is_integer($width)) {
+ if ($width === null || !is_int($width)) {
if (substr(PHP_OS, 0, 3) === 'WIN') {
// We have to default to 79 on windows, because the windows
// terminal always has a fixed width of 80 characters and the
@@ -315,7 +317,7 @@ class Console extends AbstractAdapter
/**
* Set the width of the text element
*
- * @param integer $width
+ * @param int $width
* @return \Zend\ProgressBar\Adapter\Console
*/
public function setTextWidth($width)
@@ -365,8 +367,8 @@ class Console extends AbstractAdapter
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
- * @param integer $timeTaken Taken time in seconds
- * @param integer $timeRemaining Remaining time in seconds
+ * @param int $timeTaken Taken time in seconds
+ * @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
index 0253da54c95a167e658ed6c7d55df427b05bf0ce..9bdca288af642d1c908a9cb4670c7244c6a292f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
@@ -41,8 +41,8 @@ class JsPull extends AbstractAdapter
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
- * @param integer $timeTaken Taken time in seconds
- * @param integer $timeRemaining Remaining time in seconds
+ * @param int $timeTaken Taken time in seconds
+ * @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
index 05a6bd6dd028ce8deba72dbc4e42384d3a0f77eb..13b6b00d9c558406aa540e2b5f6d57fef36a582b 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
@@ -63,8 +63,8 @@ class JsPush extends AbstractAdapter
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
- * @param integer $timeTaken Taken time in seconds
- * @param integer $timeRemaining Remaining time in seconds
+ * @param int $timeTaken Taken time in seconds
+ * @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
index 0deef369cb74c701e184de46ba6f719785011417..2c64135bfc9932d76b1b7b41404706ad9ff92be9 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
@@ -41,7 +41,7 @@ class ProgressBar
/**
* Start time of the progressbar, required for ETA
*
- * @var integer
+ * @var int
*/
protected $startTime;
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
index b8c4bfbcf0578b76346ec9b6fa3429708c3add68..e182e015cfca47b68ecde08a25ec7cb7e0b5408a 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
@@ -159,14 +159,14 @@ abstract class AbstractUploadHandler implements UploadHandlerInterface
/**
* @param string $id
- * @return array|boolean
+ * @return array|bool
*/
abstract protected function getUploadProgress($id);
/**
* Returns the formatted size
*
- * @param integer $size
+ * @param int $size
* @return string
*/
protected function toByteString($size)
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
index df20c6e99055d96083d87d6e3946699d36b930e4..eeb01d3628ae8691103a5428e25c385204c28b6f 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
@@ -20,7 +20,7 @@ class ApcProgress extends AbstractUploadHandler
{
/**
* @param string $id
- * @return array|boolean
+ * @return array|bool
* @throws Exception\PhpEnvironmentException
*/
protected function getUploadProgress($id)
@@ -53,7 +53,7 @@ class ApcProgress extends AbstractUploadHandler
/**
* Checks for the APC extension
*
- * @return boolean
+ * @return bool
*/
public function isApcAvailable()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
index f2ff8590a79f97cb7e881c177efe2a7ae6fc6090..064acba513879a0e954121c8bee4b02a196824f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
@@ -20,7 +20,7 @@ class SessionProgress extends AbstractUploadHandler
{
/**
* @param string $id
- * @return array|boolean
+ * @return array|bool
* @throws Exception\PhpEnvironmentException
*/
protected function getUploadProgress($id)
@@ -62,7 +62,7 @@ class SessionProgress extends AbstractUploadHandler
/**
* Checks if Session Upload Progress is available
*
- * @return boolean
+ * @return bool
*/
public function isSessionUploadProgressAvailable()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php
index a4d9b5d32d49b616fe5a6f21929960e5f4ae3452..1aaf5bb06746267cf901fee035b3bb827dcb2638 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php
@@ -20,7 +20,7 @@ class UploadProgress extends AbstractUploadHandler
{
/**
* @param string $id
- * @return array|boolean
+ * @return array|bool
* @throws Exception\PhpEnvironmentException
*/
protected function getUploadProgress($id)
@@ -57,7 +57,7 @@ class UploadProgress extends AbstractUploadHandler
/**
* Checks for the UploadProgress extension
*
- * @return boolean
+ * @return bool
*/
public function isUploadProgressAvailable()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json b/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
index b6e8bc9075f37830d9623c2250eeb241138357e2..42f61b62d9fadabd7d121f991715087d71b4ec56 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
@@ -18,8 +18,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php
index 4cd157ee29ab1f4daf34714ff1f7ab28edcc9ca6..9894224b02cbac91c5c85fd216ffc1ba7afa48a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php
@@ -11,9 +11,9 @@ namespace Zend\Serializer\Adapter;
use stdClass;
use Traversable;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Serializer\Exception;
use Zend\Math\BigInteger;
+use Zend\Serializer\Exception;
+use Zend\Stdlib\ArrayUtils;
/**
* @link http://www.python.org
@@ -421,7 +421,9 @@ class PythonPickle extends AbstractAdapter
$this->memorize($value);
foreach ($value as $k => $v) {
- $this->pickle .= $this->write($k) . $this->write($v) . self::OP_SETITEM;
+ $this->write($k);
+ $this->write($v);
+ $this->pickle .= self::OP_SETITEM;
}
}
@@ -441,7 +443,8 @@ class PythonPickle extends AbstractAdapter
$this->memorize($value);
foreach ($value as $v) {
- $this->pickle .= $this->write($v) . self::OP_APPEND;
+ $this->write($v);
+ $this->pickle .= self::OP_APPEND;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json b/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json
index 947696c46bca5057ef6036e88c40acbb2af718aa..6c1ec8e5e237e184ec083b7ef61e50d99e0520d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json
@@ -18,10 +18,13 @@
"zendframework/zend-json": "self.version",
"zendframework/zend-math": "self.version"
},
+ "suggest": {
+ "zendframework/zend-servicemanager": "To support plugin manager support"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php
index 932f607bb19e5764b15bd3de2987446bb8da9efe..828a0d6b2eacc847884a9c5944862882a1b11877 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php
@@ -9,9 +9,9 @@
namespace Zend\Server\Reflection;
-use ReflectionFunctionAbstract;
use ReflectionClass as PhpReflectionClass;
use ReflectionFunction as PhpReflectionFunction;
+use ReflectionFunctionAbstract;
use ReflectionMethod as PhpReflectionMethod;
use Zend\Code\Reflection\DocBlockReflection;
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/composer.json b/vendor/zendframework/zendframework/library/Zend/Server/composer.json
index f4490e4efb8bedbb49fda1af07c6945c55916eab..2d5bc49dd602c55356c6c1cc63e5b63afdc8b55c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Server/composer.json
@@ -19,8 +19,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php
index b0b26880cf8381fc6331c33176268eb7b536caee..3fb7f8dfd0c07fda31b3426e71357456e75179f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php
@@ -188,9 +188,11 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
*/
protected function createFromFactory($canonicalName, $requestedName)
{
- $factory = $this->factories[$canonicalName];
+ $factory = $this->factories[$canonicalName];
+ $hasCreationOptions = !(null === $this->creationOptions || (is_array($this->creationOptions) && empty($this->creationOptions)));
+
if (is_string($factory) && class_exists($factory, true)) {
- if (null === $this->creationOptions || (is_array($this->creationOptions) && empty($this->creationOptions))) {
+ if (!$hasCreationOptions) {
$factory = new $factory();
} else {
$factory = new $factory($this->creationOptions);
@@ -211,4 +213,35 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
return $instance;
}
+
+ /**
+ * Create service via callback
+ *
+ * @param callable $callable
+ * @param string $cName
+ * @param string $rName
+ * @throws Exception\ServiceNotCreatedException
+ * @throws Exception\ServiceNotFoundException
+ * @throws Exception\CircularDependencyFoundException
+ * @return object
+ */
+ protected function createServiceViaCallback($callable, $cName, $rName)
+ {
+ if (is_object($callable)) {
+ $factory = $callable;
+ } elseif (is_array($callable)) {
+ // reset both rewinds and returns the value of the first array element
+ $factory = reset($callable);
+ }
+
+ if (isset($factory)
+ && ($factory instanceof MutableCreationOptionsInterface)
+ && is_array($this->creationOptions)
+ && !empty($this->creationOptions)
+ ) {
+ $factory->setCreationOptions($this->creationOptions);
+ }
+
+ return parent::createServiceViaCallback($callable, $cName, $rName);
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php
index 94e1bdcc270743e02122764f61d1201839563c6e..f0a3e3ee23b6babf3c0c41d0baa3ce8d1124413a 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php
@@ -106,6 +106,17 @@ class Config implements ConfigInterface
return (isset($this->config['shared'])) ? $this->config['shared'] : array();
}
+ /**
+ * Get the delegator services map, with keys being the services acting as delegates,
+ * and values being the delegator factories names
+ *
+ * @return array
+ */
+ public function getDelegators()
+ {
+ return (isset($this->config['delegators'])) ? $this->config['delegators'] : array();
+ }
+
/**
* Configure service manager
*
@@ -145,5 +156,11 @@ class Config implements ConfigInterface
foreach ($this->getShared() as $name => $isShared) {
$serviceManager->setShared($name, $isShared);
}
+
+ foreach ($this->getDelegators() as $originalServiceName => $delegators) {
+ foreach ($delegators as $delegator) {
+ $serviceManager->addDelegator($originalServiceName, $delegator);
+ }
+ }
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/DelegatorFactoryInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/DelegatorFactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..4180a94dbb2ff017d76929190e071879139d54d1
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/DelegatorFactoryInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ServiceManager;
+
+/**
+ * Interface for factories that can create delegates for services
+ */
+interface DelegatorFactoryInterface
+{
+ /**
+ * A factory that creates delegates of a given service
+ *
+ * @param ServiceLocatorInterface $serviceLocator the service locator which requested the service
+ * @param string $name the normalized service name
+ * @param string $requestedName the requested service name
+ * @param callable $callback the callback that is responsible for creating the service
+ *
+ * @return mixed
+ */
+ public function createDelegatorWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName, $callback);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
index a68a186da5bcfc1244ffe62dabf4ee55c80e6899..71bf76703b0875d33f64dd3eff19f0ef98d4396f 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
@@ -40,10 +40,10 @@ class DiAbstractServiceFactory extends DiServiceFactory implements AbstractFacto
{
$this->serviceLocator = $serviceLocator;
if ($requestedName) {
- return $this->get($requestedName, array(), true);
+ return $this->get($requestedName, array());
}
- return $this->get($serviceName, array(), true);
+ return $this->get($serviceName, array());
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php
index 550fe1b54029b55516529394ef3fb77ee08aa69f..0139f1cef876e9e46f94f9b49414cfc251146e40 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php
@@ -81,7 +81,7 @@ class DiServiceFactory extends Di implements FactoryInterface
public function createService(ServiceLocatorInterface $serviceLocator)
{
$this->serviceLocator = $serviceLocator;
- return $this->get($this->name, $this->parameters, true);
+ return $this->get($this->name, $this->parameters);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..fe91532bbbfd05c033a75a2a40852651d733bf68
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ServiceManager;
+
+interface MutableCreationOptionsInterface
+{
+ /**
+ * Set creation options
+ *
+ * @param array $options
+ * @return void
+ */
+ public function setCreationOptions(array $options);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..eb033680b911c3d60dacbdc766c4322f8dc6f234
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ServiceManager\Proxy;
+
+use ProxyManager\Factory\LazyLoadingValueHolderFactory;
+
+use ProxyManager\Proxy\LazyLoadingInterface;
+use Zend\ServiceManager\DelegatorFactoryInterface;
+use Zend\ServiceManager\Exception;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Delegator factory responsible of instantiating lazy loading value holder proxies of
+ * given services at runtime
+ *
+ * @link https://github.com/Ocramius/ProxyManager/blob/master/docs/lazy-loading-value-holder.md
+ */
+class LazyServiceFactory implements DelegatorFactoryInterface
+{
+ /**
+ * @var \ProxyManager\Factory\LazyLoadingValueHolderFactory
+ */
+ protected $proxyFactory;
+
+ /**
+ * @var string[] map of service names to class names
+ */
+ protected $servicesMap;
+
+ /**
+ * @param LazyLoadingValueHolderFactory $proxyFactory
+ * @param string[] $servicesMap a map of service names to class names of their
+ * respective classes
+ */
+ public function __construct(LazyLoadingValueHolderFactory $proxyFactory, array $servicesMap)
+ {
+ $this->proxyFactory = $proxyFactory;
+ $this->servicesMap = $servicesMap;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return object|\ProxyManager\Proxy\LazyLoadingInterface|\ProxyManager\Proxy\ValueHolderInterface
+ */
+ public function createDelegatorWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName, $callback)
+ {
+ $initializer = function (& $wrappedInstance, LazyLoadingInterface $proxy) use ($callback) {
+ $proxy->setProxyInitializer(null);
+
+ $wrappedInstance = call_user_func($callback);
+
+ return true;
+ };
+
+ if (isset($this->servicesMap[$requestedName])) {
+ return $this->proxyFactory->createProxy($this->servicesMap[$requestedName], $initializer);
+ } elseif (isset($this->servicesMap[$name])) {
+ return $this->proxyFactory->createProxy($this->servicesMap[$name], $initializer);
+ }
+
+ throw new Exception\InvalidServiceNameException(
+ sprintf('The requested service "%s" was not found in the provided services map', $requestedName)
+ );
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..6861d6e9820b1a6b4a89bef10eaa945c747b057f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ServiceManager\Proxy;
+
+use ProxyManager\Configuration;
+use ProxyManager\Factory\LazyLoadingValueHolderFactory;
+use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Exception;
+
+/**
+ * Service factory responsible of instantiating {@see \Zend\ServiceManager\Proxy\LazyServiceFactory}
+ * and configuring it starting from application configuration
+ */
+class LazyServiceFactoryFactory implements FactoryInterface
+{
+ /**
+ * {@inheritDoc}
+ *
+ * @return \Zend\ServiceManager\Proxy\LazyServiceFactory
+ */
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ $config = $serviceLocator->get('Config');
+
+ if (!isset($config['lazy_services'])) {
+ throw new Exception\InvalidArgumentException('Missing "lazy_services" config key');
+ }
+
+ $lazyServices = $config['lazy_services'];
+
+ if (!isset($lazyServices['class_map'])) {
+ throw new Exception\InvalidArgumentException('Missing "class_map" config key in "lazy_services"');
+ }
+
+ $factoryConfig = new Configuration();
+
+ if (isset($lazyServices['proxies_target_dir'])) {
+ $factoryConfig->setProxiesTargetDir($lazyServices['proxies_target_dir']);
+ }
+
+ if (!isset($lazyServices['write_proxy_files']) || ! $lazyServices['write_proxy_files']) {
+ $factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
+ }
+
+ if (isset($lazyServices['auto_generate_proxies'])) {
+ $factoryConfig->setAutoGenerateProxies($lazyServices['auto_generate_proxies']);
+
+ // register the proxy autoloader if the proxies already exist
+ if (!$lazyServices['auto_generate_proxies']) {
+ spl_autoload_register($factoryConfig->getProxyAutoloader());
+
+ $factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
+ }
+ }
+
+ //if (!isset($lazyServicesConfig['runtime_evaluate_proxies']))
+
+ if (isset($lazyServices['proxies_namespace'])) {
+ $factoryConfig->setProxiesNamespace($lazyServices['proxies_namespace']);
+ }
+
+ return new LazyServiceFactory(new LazyLoadingValueHolderFactory($factoryConfig), $lazyServices['class_map']);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
index 8d12f9f23747d1b5602db381ae625d8cf059525d..f284698a3e93100ea8b8bb0c2f96c0b16da7f8b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
@@ -48,11 +48,26 @@ class ServiceManager implements ServiceLocatorInterface
*/
protected $abstractFactories = array();
+ /**
+ * @var array[]
+ */
+ protected $delegators = array();
+
/**
* @var array
*/
protected $pendingAbstractFactoryRequests = array();
+ /**
+ * @var string
+ */
+ protected $lastAbstractFactoryUsed = null;
+
+ /**
+ * @var string
+ */
+ protected $lastCanonicalNameUsed = null;
+
/**
* @var array
*/
@@ -233,7 +248,7 @@ class ServiceManager implements ServiceLocatorInterface
}
if ($shared === null) {
- $shared = $this->shareByDefault();
+ $shared = $this->shareByDefault;
}
$this->invokableClasses[$cName] = $invokableClass;
@@ -256,7 +271,7 @@ class ServiceManager implements ServiceLocatorInterface
{
$cName = $this->canonicalizeName($name);
- if (!is_string($factory) && !$factory instanceof FactoryInterface && !is_callable($factory)) {
+ if (!($factory instanceof FactoryInterface || is_string($factory) || is_callable($factory))) {
throw new Exception\InvalidArgumentException(
'Provided abstract factory must be the class name of an abstract factory or an instance of an AbstractFactoryInterface.'
);
@@ -273,7 +288,7 @@ class ServiceManager implements ServiceLocatorInterface
}
if ($shared === null) {
- $shared = $this->shareByDefault();
+ $shared = $this->shareByDefault;
}
$this->factories[$cName] = $factory;
@@ -292,24 +307,16 @@ class ServiceManager implements ServiceLocatorInterface
*/
public function addAbstractFactory($factory, $topOfStack = true)
{
- if (!is_string($factory) && !$factory instanceof AbstractFactoryInterface) {
+ if (!$factory instanceof AbstractFactoryInterface && is_string($factory)) {
+ $factory = new $factory();
+ }
+
+ if (!$factory instanceof AbstractFactoryInterface) {
throw new Exception\InvalidArgumentException(
- 'Provided abstract factory must be the class name of an abstract factory or an instance of an AbstractFactoryInterface.'
+ 'Provided abstract factory must be the class name of an abstract'
+ . ' factory or an instance of an AbstractFactoryInterface.'
);
}
- if (is_string($factory)) {
- if (!class_exists($factory, true)) {
- throw new Exception\InvalidArgumentException(
- 'Provided abstract factory must be the class name of an abstract factory or an instance of an AbstractFactoryInterface.'
- );
- }
- $refl = new ReflectionClass($factory);
- if (!$refl->implementsInterface(__NAMESPACE__ . '\\AbstractFactoryInterface')) {
- throw new Exception\InvalidArgumentException(
- 'Provided abstract factory must be the class name of an abstract factory or an instance of an AbstractFactoryInterface.'
- );
- }
- }
if ($topOfStack) {
array_unshift($this->abstractFactories, $factory);
@@ -319,6 +326,27 @@ class ServiceManager implements ServiceLocatorInterface
return $this;
}
+ /**
+ * Sets the given service name as to be handled by a delegator factory
+ *
+ * @param string $serviceName name of the service being the delegate
+ * @param string $delegatorFactoryName name of the service being the delegator factory
+ *
+ * @return ServiceManager
+ */
+ public function addDelegator($serviceName, $delegatorFactoryName)
+ {
+ $cName = $this->canonicalizeName($serviceName);
+
+ if (!isset($this->delegators[$cName])) {
+ $this->delegators[$cName] = array();
+ }
+
+ $this->delegators[$cName][] = $delegatorFactoryName;
+
+ return $this;
+ }
+
/**
* Add initializer
*
@@ -329,13 +357,14 @@ class ServiceManager implements ServiceLocatorInterface
*/
public function addInitializer($initializer, $topOfStack = true)
{
- if (!is_callable($initializer) && !$initializer instanceof InitializerInterface) {
- if (!is_string($initializer)
- || !$this->isSubclassOf($initializer, __NAMESPACE__ . '\InitializerInterface')
- ) {
+ if (!($initializer instanceof InitializerInterface || is_callable($initializer))) {
+ if (is_string($initializer)) {
+ $initializer = new $initializer;
+ }
+
+ if (!($initializer instanceof InitializerInterface || is_callable($initializer))) {
throw new Exception\InvalidArgumentException('$initializer should be callable.');
}
- $initializer = new $initializer;
}
if ($topOfStack) {
@@ -410,10 +439,16 @@ class ServiceManager implements ServiceLocatorInterface
*/
public function get($name, $usePeeringServiceManagers = true)
{
- $cName = $this->canonicalizeName($name);
+ // inlined code from ServiceManager::canonicalizeName for performance
+ if (isset($this->canonicalNames[$name])) {
+ $cName = $this->canonicalNames[$name];
+ } else {
+ $cName = $this->canonicalizeName($name);
+ }
+
$isAlias = false;
- if ($this->hasAlias($cName)) {
+ if (isset($this->aliases[$cName])) {
$isAlias = true;
do {
@@ -421,10 +456,9 @@ class ServiceManager implements ServiceLocatorInterface
} while ($this->hasAlias($cName));
}
- $instance = null;
- $retrieveFromPeeringManagerFirst = $this->retrieveFromPeeringManagerFirst();
+ $instance = null;
- if ($usePeeringServiceManagers && $retrieveFromPeeringManagerFirst) {
+ if ($usePeeringServiceManagers && $this->retrieveFromPeeringManagerFirst) {
$instance = $this->retrieveFromPeeringManager($name);
if (null !== $instance) {
@@ -437,15 +471,21 @@ class ServiceManager implements ServiceLocatorInterface
}
if (!$instance) {
- if ($this->canCreate(array($cName, $name))) {
+ if (
+ isset($this->invokableClasses[$cName])
+ || isset($this->factories[$cName])
+ || isset($this->aliases[$cName])
+ || isset($this->instances[$cName])
+ || $this->canCreateFromAbstractFactory($cName, $name)
+ ) {
$instance = $this->create(array($cName, $name));
- } elseif ($usePeeringServiceManagers && !$retrieveFromPeeringManagerFirst) {
+ } elseif ($usePeeringServiceManagers && !$this->retrieveFromPeeringManagerFirst) {
$instance = $this->retrieveFromPeeringManager($name);
}
}
// Still no instance? raise an exception
- if ($instance === null && !is_array($instance)) {
+ if ($instance === null) {
if ($isAlias) {
throw new Exception\ServiceNotFoundException(sprintf(
'An alias "%s" was requested but no service could be found.',
@@ -461,7 +501,7 @@ class ServiceManager implements ServiceLocatorInterface
}
if (
- ($this->shareByDefault() && !isset($this->shared[$cName]))
+ ($this->shareByDefault && !isset($this->shared[$cName]))
|| (isset($this->shared[$cName]) && $this->shared[$cName] === true)
) {
$this->instances[$cName] = $instance;
@@ -471,24 +511,88 @@ class ServiceManager implements ServiceLocatorInterface
}
/**
- * Create an instance
+ * Create an instance of the requested service
*
* @param string|array $name
+ *
* @return bool|object
- * @throws Exception\ServiceNotFoundException
- * @throws Exception\ServiceNotCreatedException
*/
public function create($name)
{
- $instance = false;
-
if (is_array($name)) {
list($cName, $rName) = $name;
} else {
$rName = $name;
- $cName = $this->canonicalizeName($rName);
+
+ // inlined code from ServiceManager::canonicalizeName for performance
+ if (isset($this->canonicalNames[$rName])) {
+ $cName = $this->canonicalNames[$name];
+ } else {
+ $cName = $this->canonicalizeName($name);
+ }
+ }
+
+ if (isset($this->delegators[$cName])) {
+ $serviceManager = $this;
+ $additionalDelegators = count($this->delegators[$cName]) - 1;
+ $creationCallback = function () use ($serviceManager, $rName, $cName) {
+ return $serviceManager->doCreate($rName, $cName);
+ };
+
+ for ($i = 0; $i < $additionalDelegators; $i += 1) {
+ $creationCallback = $this->createDelegatorCallback(
+ $this->delegators[$cName][$i],
+ $rName,
+ $cName,
+ $creationCallback
+ );
+ }
+
+ /* @var $delegatorFactory DelegatorFactoryInterface */
+ $delegatorFactory = $this->get($this->delegators[$cName][$i]);
+
+ return $delegatorFactory->createDelegatorWithName($this, $cName, $rName, $creationCallback);
}
+ return $this->doCreate($rName, $cName);
+ }
+
+ /**
+ * Creates a callback that uses a delegator to create a service
+ *
+ * @param string $delegatorFactoryName name of the delegator factory service
+ * @param string $rName requested service name
+ * @param string $cName canonical service name
+ * @param callable $creationCallback callback that is responsible for instantiating the service
+ *
+ * @return callable
+ */
+ private function createDelegatorCallback($delegatorFactoryName, $rName, $cName, $creationCallback)
+ {
+ $serviceManager = $this;
+
+ return function () use ($serviceManager, $delegatorFactoryName, $rName, $cName, $creationCallback) {
+ /* @var $delegatorFactory DelegatorFactoryInterface */
+ $delegatorFactory = $serviceManager->get($delegatorFactoryName);
+
+ return $delegatorFactory->createDelegatorWithName($serviceManager, $cName, $rName, $creationCallback);
+ };
+ }
+
+ /**
+ * Actually creates the service
+ *
+ * @param string $rName real service name
+ * @param string $cName canonicalized service name
+ *
+ * @return bool|mixed|null|object
+ * @throws Exception\ServiceNotFoundException
+ *
+ * @internal this method is internal because of PHP 5.3 compatibility - do not explicitly use it
+ */
+ public function doCreate($rName, $cName)
+ {
+ $instance = false;
if (isset($this->factories[$cName])) {
$instance = $this->createFromFactory($cName, $rName);
@@ -502,7 +606,7 @@ class ServiceManager implements ServiceLocatorInterface
$instance = $this->createFromAbstractFactory($cName, $rName);
}
- if ($this->throwExceptionInCreate == true && $instance === false) {
+ if ($instance === false && $this->throwExceptionInCreate) {
throw new Exception\ServiceNotFoundException(sprintf(
'No valid instance was found for %s%s',
$cName,
@@ -513,8 +617,6 @@ class ServiceManager implements ServiceLocatorInterface
foreach ($this->initializers as $initializer) {
if ($initializer instanceof InitializerInterface) {
$initializer->initialize($instance, $this);
- } elseif (is_object($initializer) && is_callable($initializer)) {
- $initializer($instance, $this);
} else {
call_user_func($initializer, $instance, $this);
}
@@ -529,6 +631,8 @@ class ServiceManager implements ServiceLocatorInterface
* @param string|array $name
* @param bool $checkAbstractFactories
* @return bool
+ *
+ * @deprecated this method is being deprecated as of zendframework 2.2, and may be removed in future major versions
*/
public function canCreate($name, $checkAbstractFactories = true)
{
@@ -539,20 +643,13 @@ class ServiceManager implements ServiceLocatorInterface
$cName = $this->canonicalizeName($rName);
}
- if (
+ return (
isset($this->invokableClasses[$cName])
|| isset($this->factories[$cName])
|| isset($this->aliases[$cName])
|| isset($this->instances[$cName])
- ) {
- return true;
- }
-
- if ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $rName)) {
- return true;
- }
-
- return false;
+ || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $rName))
+ );
}
/**
@@ -567,10 +664,22 @@ class ServiceManager implements ServiceLocatorInterface
list($cName, $rName) = $name;
} else {
$rName = $name;
- $cName = $this->canonicalizeName($rName);
+
+ // inlined code from ServiceManager::canonicalizeName for performance
+ if (isset($this->canonicalNames[$rName])) {
+ $cName = $this->canonicalNames[$name];
+ } else {
+ $cName = $this->canonicalizeName($name);
+ }
}
- if ($this->canCreate(array($cName, $rName), $checkAbstractFactories)) {
+ if (
+ isset($this->invokableClasses[$cName])
+ || isset($this->factories[$cName])
+ || isset($this->aliases[$cName])
+ || isset($this->instances[$cName])
+ || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $name))
+ ) {
return true;
}
@@ -595,20 +704,28 @@ class ServiceManager implements ServiceLocatorInterface
public function canCreateFromAbstractFactory($cName, $rName)
{
// check abstract factories
- foreach ($this->abstractFactories as $index => $abstractFactory) {
- // Support string abstract factory class names
- if (is_string($abstractFactory) && class_exists($abstractFactory, true)) {
- $this->abstractFactories[$index] = $abstractFactory = new $abstractFactory();
- }
+ foreach ($this->abstractFactories as $abstractFactory) {
+ $factoryClass = get_class($abstractFactory);
if (
- isset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)])
- && $this->pendingAbstractFactoryRequests[get_class($abstractFactory)] == $rName
+ isset($this->pendingAbstractFactoryRequests[$factoryClass])
+ && $this->pendingAbstractFactoryRequests[$factoryClass] == $rName
) {
return false;
}
+ $objectHash = spl_object_hash($abstractFactory);
+
+ if ($this->lastAbstractFactoryUsed === $objectHash && $this->lastCanonicalNameUsed === $cName) {
+ $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
+ return false;
+ }
+
+ $this->lastAbstractFactoryUsed = $objectHash;
+ $this->lastCanonicalNameUsed = $cName;
+
if ($abstractFactory->canCreateServiceWithName($this, $cName, $rName)) {
+ $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
return true;
}
}
@@ -655,8 +772,7 @@ class ServiceManager implements ServiceLocatorInterface
*/
public function hasAlias($alias)
{
- $alias = $this->canonicalizeName($alias);
- return (isset($this->aliases[$alias]));
+ return isset($this->aliases[$this->canonicalizeName($alias)]);
}
/**
@@ -939,6 +1055,8 @@ class ServiceManager implements ServiceLocatorInterface
* @param string $className
* @param string $type
* @return bool
+ *
+ * @deprecated this method is being deprecated as of zendframework 2.2, and may be removed in future major versions
*/
protected static function isSubclassOf($className, $type)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json b/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json
index 8702817737242923ddf086c54857f64075b3d70b..15e65e28e3be141d2d067822b7c65042547887b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php
index 68f8740cc01a466079e63a4719eedaa244b678b0..28611a2086adb9a01a7de5716a1f51c03b2bcb90 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php
@@ -9,12 +9,12 @@
namespace Zend\Session;
-use Zend\Stdlib\ArrayObject;
use ArrayIterator;
use Iterator;
use Traversable;
use Zend\Session\ManagerInterface as Manager;
use Zend\Session\Storage\StorageInterface as Storage;
+use Zend\Stdlib\ArrayObject;
/**
* Session storage container
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
index 9424a8b2c773c738156b6e3f6946ead285379576..64bafc61ac08eedd90ea931ee9177069e454643e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
@@ -9,10 +9,10 @@
namespace Zend\Session\Config;
+use Traversable;
use Zend\Session\Config\ConfigInterface;
use Zend\Session\Exception;
use Zend\Validator\Hostname as HostnameValidator;
-use Traversable;
/**
* Standard session configuration
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php
index e33ea88f763b6f8e615c68bb1fb43f704bcf9504..87ee33522e0d7ae5989f12c0697cfd0b3293711d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php
@@ -79,7 +79,7 @@ class MongoDB implements SaveHandlerInterface
*
* @param string $savePath
* @param string $name
- * @return boolean
+ * @return bool
*/
public function open($savePath, $name)
{
@@ -93,7 +93,7 @@ class MongoDB implements SaveHandlerInterface
/**
* Close session
*
- * @return boolean
+ * @return bool
*/
public function close()
{
@@ -130,7 +130,7 @@ class MongoDB implements SaveHandlerInterface
*
* @param string $id
* @param string $data
- * @return boolean
+ * @return bool
*/
public function write($id, $data)
{
@@ -165,7 +165,7 @@ class MongoDB implements SaveHandlerInterface
* Destroy session
*
* @param string $id
- * @return boolean
+ * @return bool
*/
public function destroy($id)
{
@@ -188,7 +188,7 @@ class MongoDB implements SaveHandlerInterface
*
* @see http://docs.mongodb.org/manual/tutorial/expire-data/
* @param int $maxlifetime
- * @return boolean
+ * @return bool
*/
public function gc($maxlifetime)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/ContainerAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..7ebf5ac2033925b8ecf5d8665af1222483e6769a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Session\Service;
+
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Session\Container;
+
+/**
+ * Session container abstract service factory.
+ *
+ * Allows creating Container instances, using the Zend\Service\ManagerInterface
+ * if present. Containers are named in a "session_containers" array in the
+ * Config service:
+ *
+ * <code>
+ * return array(
+ * 'session_containers' => array(
+ * 'auth',
+ * 'user',
+ * 'captcha',
+ * ),
+ * );
+ * </code>
+ *
+ * Services use the prefix "SessionContainer\\":
+ *
+ * <code>
+ * $container = $services->get('SessionContainer\captcha');
+ * </code>
+ */
+class ContainerAbstractServiceFactory implements AbstractFactoryInterface
+{
+ /**
+ * Cached container configuration
+ *
+ * @var array
+ */
+ protected $config;
+
+ /**
+ * Configuration key in which session containers live
+ *
+ * @var string
+ */
+ protected $configKey = 'session_containers';
+
+ /**
+ * @var \Zend\Session\ManagerInterface
+ */
+ protected $sessionManager;
+
+ /**
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return bool
+ */
+ public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $config = $this->getConfig($services);
+ if (empty($config)) {
+ return false;
+ }
+
+ $containerName = $this->normalizeContainerName($requestedName);
+ return array_key_exists($containerName, $config);
+ }
+
+ /**
+ * @param ServiceLocatorInterface $services
+ * @param string $name
+ * @param string $requestedName
+ * @return Container
+ */
+ public function createServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
+ {
+ $manager = $this->getSessionManager($services);
+ return new Container($requestedName, $manager);
+ }
+
+ /**
+ * Retrieve config from service locator, and cache for later
+ *
+ * @param ServiceLocatorInterface $services
+ * @return false|array
+ */
+ protected function getConfig(ServiceLocatorInterface $services)
+ {
+ if (null !== $this->config) {
+ return $this->config;
+ }
+
+ if (!$services->has('Config')) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $config = $services->get('Config');
+ if (!isset($config[$this->configKey]) || !is_array($config[$this->configKey])) {
+ $this->config = array();
+ return $this->config;
+ }
+
+ $config = $config[$this->configKey];
+ $config = array_flip($config);
+
+ $this->config = array_change_key_case($config);
+
+ return $this->config;
+ }
+
+ /**
+ * Retrieve the session manager instance, if any
+ *
+ * @param ServiceLocatorInterface $services
+ * @return null|\Zend\Session\ManagerInterface
+ */
+ protected function getSessionManager(ServiceLocatorInterface $services)
+ {
+ if ($this->sessionManager !== null) {
+ return $this->sessionManager;
+ }
+
+ if ($services->has('Zend\Session\ManagerInterface')) {
+ $this->sessionManager = $services->get('Zend\Session\ManagerInterface');
+ }
+
+ return $this->sessionManager;
+ }
+
+ /**
+ * Normalize the container name in order to perform a lookup
+ *
+ * Strips off the "SessionContainer\" prefix, and lowercases the name.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function normalizeContainerName($name)
+ {
+ return strtolower($name);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionConfigFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionConfigFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..c84baf137848f56dddfd896a0605f5c3c0619015
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionConfigFactory.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Session\Service;
+
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Session\Config\ConfigInterface;
+
+class SessionConfigFactory implements FactoryInterface
+{
+ /**
+ * Create session configuration object
+ *
+ * Uses "session_config" section of configuration to seed a ConfigInterface
+ * instance. By default, Zend\Session\Config\SessionConfig will be used, but
+ * you may also specify a specific implementation variant using the
+ * "config_class" subkey.
+ *
+ * @param ServiceLocatorInterface $services
+ * @return ConfigInterface
+ * @throws ServiceNotCreatedException if session_config is missing, or an
+ * invalid config_class is used
+ */
+ public function createService(ServiceLocatorInterface $services)
+ {
+ $config = $services->get('Config');
+ if (!isset($config['session_config']) || !is_array($config['session_config'])) {
+ throw new ServiceNotCreatedException(
+ 'Configuration is missing a "session_config" key, or the value of that key is not an array'
+ );
+ }
+ $class = 'Zend\Session\Config\SessionConfig';
+ $config = $config['session_config'];
+ if (isset($config['config_class'])) {
+ if (!class_exists($config['config_class'])) {
+ throw new ServiceNotCreatedException(sprintf(
+ 'Invalid configuration class "%s" specified in "config_class" session configuration; must be a valid class',
+ $class
+ ));
+ }
+ $class = $config['config_class'];
+ unset($config['config_class']);
+ }
+
+ $sessionConfig = new $class();
+ if (!$sessionConfig instanceof ConfigInterface) {
+ throw new ServiceNotCreatedException(sprintf(
+ 'Invalid configuration class "%s" specified in "config_class" session configuration; must implement Zend\Session\Config\ConfigInterface',
+ $class
+ ));
+ }
+ $sessionConfig->setOptions($config);
+
+ return $sessionConfig;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..81a0d6e011ce95a639812c10f26c133a88522468
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Session\Service;
+
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Session\Config\ConfigInterface;
+use Zend\Session\Container;
+use Zend\Session\SaveHandler\SaveHandlerInterface;
+use Zend\Session\SessionManager;
+use Zend\Session\Storage\StorageInterface;
+
+class SessionManagerFactory implements FactoryInterface
+{
+ /**
+ * Default configuration for manager behavior
+ *
+ * @var array
+ */
+ protected $defaultManagerConfig = array(
+ 'enable_default_container_manager' => true,
+ );
+
+ /**
+ * Create session manager object
+ *
+ * Will consume any combination (or zero) of the following services, when
+ * present, to construct the SessionManager instance:
+ *
+ * - Zend\Session\Config\ConfigInterface
+ * - Zend\Session\Storage\StorageInterface
+ * - Zend\Session\SaveHandler\SaveHandlerInterface
+ *
+ * The first two have corresponding factories inside this namespace. The
+ * last, however, does not, due to the differences in implementations, and
+ * the fact that save handlers will often be written in userland. As such
+ * if you wish to attach a save handler to the manager, you will need to
+ * write your own factory, and assign it to the service name
+ * "Zend\Session\SaveHandler\SaveHandlerInterface", (or alias that name
+ * to your own service).
+ *
+ * You can configure limited behaviors via the "session_manager" key of the
+ * Config service. Currently, these include:
+ *
+ * - enable_default_container_manager: whether to inject the created instance
+ * as the default manager for Container instances. The default value for
+ * this is true; set it to false to disable.
+ *
+ * @param ServiceLocatorInterface $services
+ * @return SessionManager
+ * @throws ServiceNotCreatedException if any collaborators are not of the
+ * correct type
+ */
+ public function createService(ServiceLocatorInterface $services)
+ {
+ $config = null;
+ $storage = null;
+ $saveHandler = null;
+ $managerConfig = $this->defaultManagerConfig;
+
+ if ($services->has('Zend\Session\Config\ConfigInterface')) {
+ $config = $services->get('Zend\Session\Config\ConfigInterface');
+ if (!$config instanceof ConfigInterface) {
+ throw new ServiceNotCreatedException(sprintf(
+ 'SessionManager requires that the %s service implement %s; received "%s"',
+ 'Zend\Session\Config\ConfigInterface',
+ 'Zend\Session\Config\ConfigInterface',
+ (is_object($config) ? get_class($config) : gettype($config))
+ ));
+ }
+ }
+
+ if ($services->has('Zend\Session\Storage\StorageInterface')) {
+ $storage = $services->get('Zend\Session\Storage\StorageInterface');
+ if (!$storage instanceof StorageInterface) {
+ throw new ServiceNotCreatedException(sprintf(
+ 'SessionManager requires that the %s service implement %s; received "%s"',
+ 'Zend\Session\Storage\StorageInterface',
+ 'Zend\Session\Storage\StorageInterface',
+ (is_object($storage) ? get_class($storage) : gettype($storage))
+ ));
+ }
+ }
+
+ if ($services->has('Zend\Session\SaveHandler\SaveHandlerInterface')) {
+ $saveHandler = $services->get('Zend\Session\SaveHandler\SaveHandlerInterface');
+ if (!$saveHandler instanceof SaveHandlerInterface) {
+ throw new ServiceNotCreatedException(sprintf(
+ 'SessionManager requires that the %s service implement %s; received "%s"',
+ 'Zend\Session\SaveHandler\SaveHandlerInterface',
+ 'Zend\Session\SaveHandler\SaveHandlerInterface',
+ (is_object($saveHandler) ? get_class($saveHandler) : gettype($saveHandler))
+ ));
+ }
+ }
+
+ $manager = new SessionManager($config, $storage, $saveHandler);
+
+ // Get session manager configuration, if any, and merge with default configuration
+ if ($services->has('Config')) {
+ $configService = $services->get('Config');
+ if (isset($configService['session_manager'])
+ && is_array($configService['session_manager'])
+ ) {
+ $managerConfig = array_merge($managerConfig, $configService['session_manager']);
+ }
+ }
+
+ // If configuration enables the session manager as the default manager for container
+ // instances, do so.
+ if (isset($managerConfig['enable_default_container_manager'])
+ && $managerConfig['enable_default_container_manager']
+ ) {
+ Container::setDefaultManager($manager);
+ }
+
+ return $manager;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..667cd7ed2b6c50dddfd3770b5b78571396611891
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Session\Service;
+
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Session\Storage\Exception as SessionException;
+use Zend\Session\Storage\Factory;
+use Zend\Session\Storage\StorageInterface;
+
+class StorageFactory implements FactoryInterface
+{
+ /**
+ * Create session storage object
+ *
+ * Uses "session_storage" section of configuration to seed a StorageInterface
+ * instance. That array should contain the key "type", specifying the storage
+ * type to use, and optionally "options", containing any options to be used in
+ * creating the StorageInterface instance.
+ *
+ * @param ServiceLocatorInterface $services
+ * @return StorageInterface
+ * @throws ServiceNotCreatedException if session_storage is missing, or the
+ * factory cannot create the storage instance.
+ */
+ public function createService(ServiceLocatorInterface $services)
+ {
+ $config = $services->get('Config');
+ if (!isset($config['session_storage']) || !is_array($config['session_storage'])) {
+ throw new ServiceNotCreatedException(
+ 'Configuration is missing a "session_storage" key, or the value of that key is not an array'
+ );
+ }
+
+ $config = $config['session_storage'];
+ if (!isset($config['type'])) {
+ throw new ServiceNotCreatedException(
+ '"session_storage" configuration is missing a "type" key'
+ );
+ }
+ $type = $config['type'];
+ $options = isset($config['options']) ? $config['options'] : array();
+
+ try {
+ $storage = Factory::factory($type, $options);
+ } catch (SessionException $e) {
+ throw new ServiceNotCreatedException(sprintf(
+ 'Factory is unable to create StorageInterface instance: %s',
+ $e->getMessage()
+ ), $e->getCode(), $e);
+ }
+
+ return $storage;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
index 2ccaa2baa2e0e7469242424d512289588bed3c74..8a1cf09bab89bc5d5a7fb7736e1f2e197967f77f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
@@ -80,7 +80,7 @@ abstract class AbstractSessionArrayStorage implements IteratorAggregate, Storage
* Isset Offset
*
* @param mixed $key
- * @return boolean
+ * @return bool
*/
public function __isset($key)
{
@@ -112,7 +112,7 @@ abstract class AbstractSessionArrayStorage implements IteratorAggregate, Storage
* Offset Exists
*
* @param mixed $key
- * @return boolean
+ * @return bool
*/
public function offsetExists($key)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php
new file mode 100644
index 0000000000000000000000000000000000000000..a32b973c30c67a9a1012b5a8b72fd24f4f6943ba
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Session\Storage;
+
+use ArrayAccess;
+use Traversable;
+use Zend\Session\Exception;
+use Zend\Stdlib\ArrayObject;
+use Zend\Stdlib\ArrayUtils;
+
+abstract class Factory
+{
+ /**
+ * Create and return a StorageInterface instance
+ *
+ * @param string $type
+ * @param array|Traversable $options
+ * @return StorageInterface
+ * @throws Exception\InvalidArgumentException for unrecognized $type or individual options
+ */
+ public static function factory($type, $options = array())
+ {
+ if (!is_string($type)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects the $type argument to be a string class name; received "%s"',
+ __METHOD__,
+ (is_object($type) ? get_class($type) : gettype($type))
+ ));
+ }
+ if (!class_exists($type)) {
+ $class = __NAMESPACE__ . '\\' . $type;
+ if (!class_exists($class)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects the $type argument to be a valid class name; received "%s"',
+ __METHOD__,
+ $type
+ ));
+ }
+ $type = $class;
+ }
+
+ if ($options instanceof Traversable) {
+ $options = ArrayUtils::iteratorToArray($options);
+ }
+ if (!is_array($options)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects the $options argument to be an array or Traversable; received "%s"',
+ __METHOD__,
+ (is_object($options) ? get_class($options) : gettype($options))
+ ));
+ }
+
+ switch (true) {
+ case (in_array('Zend\Session\Storage\AbstractSessionArrayStorage', class_parents($type))):
+ return static::createSessionArrayStorage($type, $options);
+ break;
+ case ($type === 'Zend\Session\Storage\ArrayStorage'):
+ case (in_array('Zend\Session\Storage\ArrayStorage', class_parents($type))):
+ return static::createArrayStorage($type, $options);
+ break;
+ case (in_array('Zend\Session\Storage\StorageInterface', class_implements($type))):
+ return new $type($options);
+ break;
+ default:
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Unrecognized type "%s" provided; expects a class implementing %s\StorageInterface',
+ $type,
+ __NAMESPACE__
+ ));
+ }
+ }
+
+ /**
+ * Create a storage object from an ArrayStorage class (or a descendent)
+ *
+ * @param string $type
+ * @param array $options
+ * @return ArrayStorage
+ */
+ protected static function createArrayStorage($type, $options)
+ {
+ $input = array();
+ $flags = ArrayObject::ARRAY_AS_PROPS;
+ $iteratorClass = 'ArrayIterator';
+
+ if (isset($options['input']) && null !== $options['input']) {
+ if (!is_array($options['input'])) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects the "input" option to be an array; received "%s"',
+ $type,
+ (is_object($options['input']) ? get_class($options['input']) : gettype($options['input']))
+ ));
+ }
+ $input = $options['input'];
+ }
+
+ if (isset($options['flags'])) {
+ $flags = $options['flags'];
+ }
+
+ if (isset($options['iterator_class'])) {
+ if (!class_exists($options['iterator_class'])) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects the "iterator_class" option to be a valid class; received "%s"',
+ $type,
+ (is_object($options['iterator_class']) ? get_class($options['iterator_class']) : gettype($options['iterator_class']))
+ ));
+ }
+ $iteratorClass = $options['iterator_class'];
+ }
+
+ return new $type($input, $flags, $iteratorClass);
+ }
+
+ /**
+ * Create a storage object from a class extending AbstractSessionArrayStorage
+ *
+ * @param string $type
+ * @param array $options
+ * @return AbstractSessionArrayStorage
+ * @throws Exception\InvalidArgumentException if the input option is invalid
+ */
+ protected static function createSessionArrayStorage($type, array $options)
+ {
+ $input = null;
+ if (isset($options['input'])) {
+ if (null !== $options['input']
+ && !is_array($options['input'])
+ && !$input instanceof ArrayAccess
+ ) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects the "input" option to be null, an array, or to implement ArrayAccess; received "%s"',
+ $type,
+ (is_object($options['input']) ? get_class($options['input']) : gettype($options['input']))
+ ));
+ }
+ $input = $options['input'];
+ }
+
+ return new $type($input);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php
index 7096692768b12bc5d9f6c5aa0c55fbb069b18ff7..2fff8ddf304642ed12458e86327af485b0a11419 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php
@@ -9,10 +9,10 @@
namespace Zend\Session\Storage;
-use Traversable;
use ArrayAccess;
-use Serializable;
use Countable;
+use Serializable;
+use Traversable;
/**
* Session storage interface
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/composer.json b/vendor/zendframework/zendframework/library/Zend/Session/composer.json
index ee90685ab7f31a3ed7a430d5b684cb3b96dbf704..ba47ac2b93c7b318af0621bd29eaa268f0262353 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Session/composer.json
@@ -17,13 +17,14 @@
"zendframework/zend-stdlib": "self.version"
},
"suggest": {
- "zendframework/zend-validator": "Zend\\Validator component",
- "zendframework/zend-eventmanager": "Zend\\EventManager component"
+ "zendframework/zend-eventmanager": "Zend\\EventManager component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+ "zendframework/zend-validator": "Zend\\Validator component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php
index dbe6f6061386d78f9d5a1fd8dce7c646b86ce51b..2f0ecea5981e1dfaa300531eef8cf5ee65d12e53 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php
@@ -12,13 +12,11 @@ namespace Zend\Soap;
use Zend\Server\Reflection;
use Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy;
use Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery;
+use Zend\Soap\Exception;
use Zend\Soap\Wsdl;
use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
use Zend\Uri;
-/**
- * \Zend\Soap\AutoDiscover
- */
class AutoDiscover
{
/**
@@ -27,20 +25,18 @@ class AutoDiscover
protected $serviceName;
/**
- * @var \Zend\Server\Reflection
+ * @var Reflection
*/
protected $reflection = null;
/**
* Service function names
- *
* @var array
*/
protected $functions = array();
/**
* Service class name
- *
* @var string
*/
protected $class;
@@ -52,42 +48,42 @@ class AutoDiscover
/**
* Url where the WSDL file will be available at.
- *
* @var WSDL Uri
*/
protected $uri;
/**
* soap:body operation style options
- *
* @var array
*/
- protected $operationBodyStyle = array('use' => 'encoded', 'encodingStyle' => "http://schemas.xmlsoap.org/soap/encoding/");
+ protected $operationBodyStyle = array(
+ 'use' => 'encoded',
+ 'encodingStyle' => "http://schemas.xmlsoap.org/soap/encoding/"
+ );
/**
* soap:operation style
- *
* @var array
*/
- protected $bindingStyle = array('style' => 'rpc', 'transport' => 'http://schemas.xmlsoap.org/soap/http');
+ protected $bindingStyle = array(
+ 'style' => 'rpc',
+ 'transport' => 'http://schemas.xmlsoap.org/soap/http'
+ );
/**
* Name of the class to handle the WSDL creation.
- *
* @var string
*/
protected $wsdlClass = 'Zend\Soap\Wsdl';
/**
* Class Map of PHP to WSDL types.
- *
* @var array
*/
protected $classMap = array();
/**
* Discovery strategy for types and other method details.
- *
* @var DiscoveryStrategy
*/
protected $discoveryStrategy;
@@ -100,10 +96,14 @@ class AutoDiscover
* @param null|string $wsdlClass
* @param null|array $classMap
*/
- public function __construct(ComplexTypeStrategy $strategy = null, $endpointUri = null, $wsdlClass = null, array $classMap = array())
- {
+ public function __construct(
+ ComplexTypeStrategy $strategy = null,
+ $endpointUri = null,
+ $wsdlClass = null,
+ array $classMap = array()
+ ) {
$this->reflection = new Reflection();
- $this->discoveryStrategy = new ReflectionDiscovery();
+ $this->setDiscoveryStrategy(new ReflectionDiscovery());
if (null !== $strategy) {
$this->setComplexTypeStrategy($strategy);
@@ -121,7 +121,7 @@ class AutoDiscover
* Set the discovery strategy for method type and other information.
*
* @param DiscoveryStrategy $discoveryStrategy
- * @return AutoDiscover
+ * @return self
*/
public function setDiscoveryStrategy(DiscoveryStrategy $discoveryStrategy)
{
@@ -130,6 +130,8 @@ class AutoDiscover
}
/**
+ * Get the discovery strategy.
+ *
* @return DiscoveryStrategy
*/
public function getDiscoveryStrategy()
@@ -138,7 +140,7 @@ class AutoDiscover
}
/**
- * Get the class map of php to wsdl qname types.
+ * Get the class map of php to wsdl mappings.
*
* @return array
*/
@@ -148,10 +150,11 @@ class AutoDiscover
}
/**
- * Set the class map of php to wsdl qname types.
+ * Set the class map of php to wsdl mappings.
*
- * @param array $classmap
- * @return AutoDiscover
+ * @param array $classmap
+ * @return self
+ * @throws Exception\InvalidArgumentException
*/
public function setClassMap($classMap)
{
@@ -162,6 +165,7 @@ class AutoDiscover
(is_object($classMap) ? get_class($classMap) : gettype($classMap))
));
}
+
$this->classMap = $classMap;
return $this;
}
@@ -170,10 +174,19 @@ class AutoDiscover
* Set service name
*
* @param string $serviceName
- * @return AutoDiscover
+ * @return self
+ * @throws Exception\InvalidArgumentException
*/
public function setServiceName($serviceName)
{
+ $matches = array();
+
+ // first character must be letter or underscore {@see http://www.w3.org/TR/wsdl#_document-n}
+ $i = preg_match('/^[a-z\_]/ims', $serviceName, $matches);
+ if ($i != 1) {
+ throw new Exception\InvalidArgumentException('Service Name must start with letter or _');
+ }
+
$this->serviceName = $serviceName;
return $this;
}
@@ -188,16 +201,11 @@ class AutoDiscover
{
if (!$this->serviceName) {
if ($this->class) {
- return $this->reflection->reflectClass($this->class)
- ->getShortName();
+ return $this->reflection->reflectClass($this->class)->getShortName();
} else {
- throw new Exception\RuntimeException(sprintf(
- "No service name given. Call %s::setServiceName().",
- __CLASS__
- ));
+ throw new Exception\RuntimeException('No service name given. Call AutoDiscover::setServiceName().');
}
}
-
return $this->serviceName;
}
@@ -206,19 +214,25 @@ class AutoDiscover
* Set the location at which the WSDL file will be available.
*
* @param Uri\Uri|string $uri
- * @return AutoDiscover
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setUri($uri)
{
if (!is_string($uri) && !($uri instanceof Uri\Uri)) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'No uri given to %s() as string or \Zend\Uri\Uri instance.',
- __METHOD__
- ));
+ throw new Exception\InvalidArgumentException(
+ 'Argument to \Zend\Soap\AutoDiscover::setUri should be string or \Zend\Uri\Uri instance.'
+ );
}
- $this->uri = $uri;
+ $uri = trim($uri);
+ $uri = htmlspecialchars($uri, ENT_QUOTES, 'UTF-8', false);
+
+ if (empty($uri)) {
+ throw new Exception\InvalidArgumentException('Uri contains invalid characters or is empty');
+ }
+
+ $this->uri = $uri;
return $this;
}
@@ -231,15 +245,13 @@ class AutoDiscover
public function getUri()
{
if ($this->uri === null) {
- throw new Exception\RuntimeException(sprintf(
- "Missing uri. You have to explicitly configure the Endpoint Uri by calling %s::setUri().",
- __CLASS__
- ));
+ throw new Exception\RuntimeException(
+ 'Missing uri. You have to explicitly configure the Endpoint Uri by calling AutoDiscover::setUri().'
+ );
}
if (is_string($this->uri)) {
$this->uri = Uri\UriFactory::factory($this->uri);
}
-
return $this->uri;
}
@@ -247,20 +259,18 @@ class AutoDiscover
* Set the name of the WSDL handling class.
*
* @param string $wsdlClass
- * @return AutoDiscover
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setWsdlClass($wsdlClass)
{
- if (!is_string($wsdlClass) && !is_subclass_of($wsdlClass, 'Zend\Soap\Wsdl')) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'No %s\Wsdl subclass given to %s() as string.',
- __NAMESPACE__,
- __METHOD__
- ));
+ if (!is_string($wsdlClass) && !is_subclass_of($wsdlClass, '\Zend\Soap\Wsdl')) {
+ throw new Exception\InvalidArgumentException(
+ 'No \Zend\Soap\Wsdl subclass given to Zend\Soap\AutoDiscover::setWsdlClass as string.'
+ );
}
- $this->wsdlClass = $wsdlClass;
+ $this->wsdlClass = $wsdlClass;
return $this;
}
@@ -281,13 +291,13 @@ class AutoDiscover
* 'encodingStyle' => "http://schemas.xmlsoap.org/soap/encoding/".
*
* @param array $operationStyle
- * @return AutoDiscover
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setOperationBodyStyle(array $operationStyle = array())
{
if (!isset($operationStyle['use'])) {
- throw new Exception\InvalidArgumentException("Key 'use' is required in Operation soap:body style.");
+ throw new Exception\InvalidArgumentException('Key "use" is required in Operation soap:body style.');
}
$this->operationBodyStyle = $operationStyle;
return $this;
@@ -299,7 +309,7 @@ class AutoDiscover
* By default 'style' is 'rpc' and 'transport' is 'http://schemas.xmlsoap.org/soap/http'.
*
* @param array $bindingStyle
- * @return AutoDiscover
+ * @return self
*/
public function setBindingStyle(array $bindingStyle = array())
{
@@ -316,12 +326,11 @@ class AutoDiscover
* Set the strategy that handles functions and classes that are added AFTER this call.
*
* @param ComplexTypeStrategy $strategy
- * @return AutoDiscover
+ * @return self
*/
public function setComplexTypeStrategy(ComplexTypeStrategy $strategy)
{
$this->strategy = $strategy;
-
return $this;
}
@@ -329,7 +338,7 @@ class AutoDiscover
* Set the Class the SOAP server will use
*
* @param string $class Class Name
- * @return AutoDiscover
+ * @return self
*/
public function setClass($class)
{
@@ -340,12 +349,30 @@ class AutoDiscover
/**
* Add a Single or Multiple Functions to the WSDL
*
- * @param string $function Function Name
- * @return AutoDiscover
+ * @param string $function Function Name
+ * @return self
+ * @throws Exception\InvalidArgumentException
*/
public function addFunction($function)
{
- $this->functions[] = $function;
+ if (is_array($function)) {
+ foreach($function as $row){
+ $this->addFunction($row);
+ }
+ } elseif (is_string($function)) {
+ if (function_exists($function)) {
+ $this->functions[] = $function;
+ } else {
+ throw new Exception\InvalidArgumentException(
+ 'Argument to Zend\Soap\AutoDiscover::addFunction should be a valid function name.'
+ );
+ }
+
+ } else {
+ throw new Exception\InvalidArgumentException(
+ 'Argument to Zend\Soap\AutoDiscover::addFunction should be string or array of strings.'
+ );
+ }
return $this;
}
@@ -370,14 +397,13 @@ class AutoDiscover
foreach (array_unique($this->functions) as $func) {
$methods[] = $this->reflection->reflectFunction($func);
}
-
return $this->_generateWsdl($methods);
}
/**
* Generate the WSDL for a set of reflection method instances.
*
- * @param array $reflectionMethods
+ * @param array $reflectionMethods
* @return Wsdl
*/
protected function _generateWsdl(array $reflectionMethods)
@@ -385,17 +411,17 @@ class AutoDiscover
$uri = $this->getUri();
$serviceName = $this->getServiceName();
- /** @var Wsdl $wsdl */
+
$wsdl = new $this->wsdlClass($serviceName, $uri, $this->strategy, $this->classMap);
// The wsdl:types element must precede all other elements (WS-I Basic Profile 1.1 R2023)
$wsdl->addSchemaTypeSection();
$port = $wsdl->addPortType($serviceName . 'Port');
- $binding = $wsdl->addBinding($serviceName . 'Binding', 'tns:' . $serviceName . 'Port');
+ $binding = $wsdl->addBinding($serviceName . 'Binding', Wsdl::TYPES_NS . ':' . $serviceName . 'Port');
$wsdl->addSoapBinding($binding, $this->bindingStyle['style'], $this->bindingStyle['transport']);
- $wsdl->addService($serviceName . 'Service', $serviceName . 'Port', 'tns:' . $serviceName . 'Binding', $uri);
+ $wsdl->addService($serviceName . 'Service', $serviceName . 'Port', Wsdl::TYPES_NS . ':' . $serviceName . 'Binding', $uri);
foreach ($reflectionMethods as $method) {
$this->_addFunctionToWsdl($method, $wsdl, $port, $binding);
@@ -407,12 +433,11 @@ class AutoDiscover
/**
* Add a function to the WSDL document.
*
- * @param $function \Zend\Server\Reflection\AbstractFunction function to add
- * @param $wsdl \Zend\Soap\Wsdl WSDL document
- * @param $port object wsdl:portType
- * @param $binding object wsdl:binding
+ * @param $function Reflection\AbstractFunction function to add
+ * @param $wsdl Wsdl WSDL document
+ * @param $port \DOMElement wsdl:portType
+ * @param $binding \DOMElement wsdl:binding
* @throws Exception\InvalidArgumentException
- * @return void
*/
protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
{
@@ -452,12 +477,15 @@ class AutoDiscover
}
$sequence[] = $sequenceElement;
}
+
$element = array(
- 'name' => $functionName,
- 'sequence' => $sequence
+ 'name' => $functionName,
+ 'sequence' => $sequence
);
+
// Add the wrapper element part, which must be named 'parameters'
$args['parameters'] = array('element' => $wsdl->addElement($element));
+
} else {
// RPC style: add each parameter as a typed part
foreach ($prototype->getParameters() as $param) {
@@ -482,33 +510,47 @@ class AutoDiscover
'type' => $wsdl->getType($this->discoveryStrategy->getFunctionReturnType($function, $prototype))
);
}
+
$element = array(
- 'name' => $functionName . 'Response',
- 'sequence' => $sequence
+ 'name' => $functionName . 'Response',
+ 'sequence' => $sequence
);
+
// Add the wrapper element part, which must be named 'parameters'
$args['parameters'] = array('element' => $wsdl->addElement($element));
+
} elseif ($prototype->getReturnType() != "void") {
// RPC style: add the return value as a typed part
$args['return'] = array(
'type' => $wsdl->getType($this->discoveryStrategy->getFunctionReturnType($function, $prototype))
);
}
+
$wsdl->addMessage($functionName . 'Out', $args);
}
// Add the portType operation
if ($isOneWayMessage == false) {
- $portOperation = $wsdl->addPortOperation($port, $functionName, 'tns:' . $functionName . 'In', 'tns:' . $functionName . 'Out');
+ $portOperation = $wsdl->addPortOperation(
+ $port,
+ $functionName,
+ Wsdl::TYPES_NS . ':' . $functionName . 'In', Wsdl::TYPES_NS . ':' . $functionName . 'Out'
+ );
} else {
- $portOperation = $wsdl->addPortOperation($port, $functionName, 'tns:' . $functionName . 'In', false);
+ $portOperation = $wsdl->addPortOperation(
+ $port,
+ $functionName,
+ Wsdl::TYPES_NS . ':' . $functionName . 'In', false
+ );
}
$desc = $this->discoveryStrategy->getFunctionDocumentation($function);
+
if (strlen($desc) > 0) {
$wsdl->addDocumentation($portOperation, $desc);
}
- // When using the RPC style, make sure the operation style includes a 'namespace' attribute (WS-I Basic Profile 1.1 R2717)
+ // When using the RPC style, make sure the operation style includes a 'namespace'
+ // attribute (WS-I Basic Profile 1.1 R2717)
$operationBodyStyle = $this->operationBodyStyle;
if ($this->bindingStyle['style'] == 'rpc' && !isset($operationBodyStyle['namespace'])) {
$operationBodyStyle['namespace'] = '' . $uri;
@@ -526,13 +568,13 @@ class AutoDiscover
/**
* Generate the WSDL file from the configured input.
*
- * @throws Exception\RuntimeException
* @return Wsdl
+ * @throws Exception\RuntimeException
*/
public function generate()
{
if ($this->class && $this->functions) {
- throw new Exception\RuntimeException("Can either dump functions or a class as a service, not both.");
+ throw new Exception\RuntimeException('Can either dump functions or a class as a service, not both.');
}
if ($this->class) {
@@ -547,9 +589,9 @@ class AutoDiscover
/**
* Proxy to WSDL dump function
*
- * @param string $filename
+ * @param string $filename
* @return bool
- * @throws \Zend\Soap\Exception\RuntimeException
+ * @throws Exception\RuntimeException
*/
public function dump($filename)
{
@@ -560,7 +602,7 @@ class AutoDiscover
* Proxy to WSDL toXml() function
*
* @return string
- * @throws \Zend\Soap\Exception\RuntimeException
+ * @throws Exception\RuntimeException
*/
public function toXml()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
index 1207ec482a4a8b00854399abefd3bbe211289cc3..22f33dbf15b52e8d862223b48619f7ca4d275ac1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
@@ -14,7 +14,8 @@ use Zend\Server\Reflection\Prototype;
use Zend\Server\Reflection\ReflectionParameter;
/**
- * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL.
+ * Describes how types, return values and method details are detected during
+ * AutoDiscovery of a WSDL.
*/
interface DiscoveryStrategyInterface
{
@@ -23,7 +24,7 @@ interface DiscoveryStrategyInterface
*
* Default implementation assumes the default param doc-block tag.
*
- * @param ReflectionParameter $param
+ * @param ReflectionParameter $param
* @return string
*/
public function getFunctionParameterType(ReflectionParameter $param);
@@ -33,8 +34,8 @@ interface DiscoveryStrategyInterface
*
* Default implementation assumes the value of the return doc-block tag.
*
- * @param AbstractFunction $function
- * @param Prototype $prototype
+ * @param AbstractFunction $function
+ * @param Prototype $prototype
* @return string
*/
public function getFunctionReturnType(AbstractFunction $function, Prototype $prototype);
@@ -44,8 +45,8 @@ interface DiscoveryStrategyInterface
*
* Default implementation assumes one-way, when return value is "void".
*
- * @param AbstractFunction $function
- * @param Prototype $prototype
+ * @param AbstractFunction $function
+ * @param Prototype $prototype
* @return bool
*/
public function isFunctionOneWay(AbstractFunction $function, Prototype $prototype);
@@ -55,7 +56,7 @@ interface DiscoveryStrategyInterface
*
* Default implementation uses docblock description.
*
- * @param AbstractFunction $function
+ * @param AbstractFunction $function
* @return string
*/
public function getFunctionDocumentation(AbstractFunction $function);
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
index 634b55b4eb3795795e01086745a4c0bf1fe66853..44559de9fa9be1eaedbcf67509d95cafc374a8ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
@@ -14,26 +14,52 @@ use Zend\Server\Reflection\Prototype;
use Zend\Server\Reflection\ReflectionParameter;
/**
- * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL.
+ * Describes how types, return values and method details are detected during
+ * AutoDiscovery of a WSDL.
*/
-
class ReflectionDiscovery implements DiscoveryStrategyInterface
{
+ /**
+ * Returns description from phpdoc block
+ *
+ * @param AbstractFunction $function
+ * @return string
+ */
public function getFunctionDocumentation(AbstractFunction $function)
{
return $function->getDescription();
}
+ /**
+ * Return parameter type
+ *
+ * @param ReflectionParameter $param
+ * @return string
+ */
public function getFunctionParameterType(ReflectionParameter $param)
{
return $param->getType();
}
+ /**
+ * Return function return type
+ *
+ * @param AbstractFunction $function
+ * @param Prototype $prototype
+ * @return string
+ */
public function getFunctionReturnType(AbstractFunction $function, Prototype $prototype)
{
return $prototype->getReturnType();
}
+ /**
+ * Return true if function is one way (return nothing)
+ *
+ * @param AbstractFunction $function
+ * @param Prototype $prototype
+ * @return bool
+ */
public function isFunctionOneWay(AbstractFunction $function, Prototype $prototype)
{
return $prototype->getReturnType() == 'void';
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
index 5d409e6f961f0920b8446e65db1f7d377a4c619f..ef9b9ef0da0d3e4b9472102d23ffc3e451aee696 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
@@ -15,23 +15,20 @@ use Traversable;
use Zend\Server\Client as ServerClient;
use Zend\Stdlib\ArrayUtils;
-/**
- * \Zend\Soap\Client
- */
class Client implements ServerClient
{
- /**
- * Encoding
- * @var string
- */
- protected $encoding = 'UTF-8';
-
/**
* Array of SOAP type => PHP class pairings for handling return/incoming values
* @var array
*/
protected $classmap = null;
+ /**
+ * Encoding
+ * @var string
+ */
+ protected $encoding = 'UTF-8';
+
/**
* Registered fault exceptions
* @var array
@@ -39,83 +36,82 @@ class Client implements ServerClient
protected $faultExceptions = array();
/**
- * SOAP version to use; SOAP_1_2 by default, to allow processing of headers
- * @var int
+ * Last invoked method
+ * @var string
*/
- protected $soapVersion = SOAP_1_2;
-
- /** Set of other SoapClient options */
- protected $uri = null;
- protected $location = null;
- protected $style = null;
- protected $use = null;
- protected $login = null;
- protected $password = null;
- protected $proxyHost = null;
- protected $proxyPort = null;
- protected $proxyLogin = null;
- protected $proxyPassword = null;
- protected $localCert = null;
- protected $passphrase = null;
- protected $compression = null;
- protected $connectionTimeout = null;
- protected $streamContext = null;
- protected $features = null;
- protected $cacheWsdl = null;
- protected $userAgent = null;
+ protected $lastMethod = '';
/**
- * WSDL used to access server
- * It also defines Client working mode (WSDL vs non-WSDL)
- *
- * @var string
+ * Permanent SOAP request headers (shared between requests).
+ * @var array
*/
- protected $wsdl = null;
+ protected $permanentSoapInputHeaders = array();
/**
* SoapClient object
- *
* @var SoapClient
*/
protected $soapClient;
/**
- * Last invoked method
- *
- * @var string
+ * Array of SoapHeader objects
+ * @var SoapHeader[]
*/
- protected $lastMethod = '';
+ protected $soapInputHeaders = array();
/**
- * SOAP request headers.
- *
* Array of SoapHeader objects
- *
* @var array
*/
- protected $soapInputHeaders = array();
+ protected $soapOutputHeaders = array();
/**
- * Permanent SOAP request headers (shared between requests).
- *
- * Array of SoapHeader objects
- *
- * @var array
+ * SOAP version to use; SOAP_1_2 by default, to allow processing of headers
+ * @var int
*/
- protected $permanentSoapInputHeaders = array();
+ protected $soapVersion = SOAP_1_2;
/**
- * Output SOAP headers.
- *
- * Array of SoapHeader objects
- *
* @var array
*/
- protected $soapOutputHeaders = array();
+ protected $typemap = null;
+
+ /**
+ * WSDL used to access server
+ * It also defines Client working mode (WSDL vs non-WSDL)
+ * @var string
+ */
+ protected $wsdl = null;
+
+ /**#@+
+ * @var string
+ */
+ protected $connectionTimeout = null;
+ protected $localCert = null;
+ protected $location = null;
+ protected $login = null;
+ protected $passphrase = null;
+ protected $password = null;
+ protected $proxyHost = null;
+ protected $proxyLogin = null;
+ protected $proxyPassword = null;
+ protected $proxyPort = null;
+ protected $streamContext = null;
+ protected $style = null;
+ protected $uri = null;
+ protected $use = null;
+ protected $userAgent = null;
+ /**#@-*/
+
+ /**#@+
+ * @var int
+ */
+ protected $cacheWsdl = null;
+ protected $compression = null;
+ protected $features = null;
+ /**#@-*/
/**
- * Constructor
- *
* @param string $wsdl
* @param array|Traversable $options
* @throws Exception\ExtensionNotLoadedException
@@ -137,8 +133,8 @@ class Client implements ServerClient
/**
* Set wsdl
*
- * @param string $wsdl
- * @return Client
+ * @param string $wsdl
+ * @return self
*/
public function setWSDL($wsdl)
{
@@ -164,7 +160,7 @@ class Client implements ServerClient
* Allows setting options as an associative array of option => value pairs.
*
* @param array|Traversable $options
- * @return Client
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setOptions($options)
@@ -174,75 +170,99 @@ class Client implements ServerClient
}
foreach ($options as $key => $value) {
- switch ($key) {
+ switch (strtolower($key)) {
case 'classmap':
- case 'classMap':
+ case 'class_map':
$this->setClassmap($value);
break;
+
case 'encoding':
$this->setEncoding($value);
break;
+
case 'soapVersion':
case 'soap_version':
$this->setSoapVersion($value);
break;
+
case 'wsdl':
$this->setWSDL($value);
break;
+
case 'uri':
$this->setUri($value);
break;
+
case 'location':
$this->setLocation($value);
break;
+
case 'style':
$this->setStyle($value);
break;
+
case 'use':
$this->setEncodingMethod($value);
break;
+
case 'login':
$this->setHttpLogin($value);
break;
+
case 'password':
$this->setHttpPassword($value);
break;
+
case 'proxy_host':
$this->setProxyHost($value);
break;
+
case 'proxy_port':
$this->setProxyPort($value);
break;
+
case 'proxy_login':
$this->setProxyLogin($value);
break;
+
case 'proxy_password':
$this->setProxyPassword($value);
break;
+
case 'local_cert':
$this->setHttpsCertificate($value);
break;
+
case 'passphrase':
$this->setHttpsCertPassphrase($value);
break;
+
case 'compression':
$this->setCompressionOptions($value);
break;
+
case 'stream_context':
$this->setStreamContext($value);
break;
+
case 'features':
$this->setSoapFeatures($value);
break;
+
case 'cache_wsdl':
$this->setWSDLCache($value);
break;
+
case 'useragent':
- case 'userAgent':
case 'user_agent':
$this->setUserAgent($value);
break;
+ case 'type_map':
+ case 'typemap':
+ $this->setTypemap($value);
+ break;
+
// Not used now
// case 'connection_timeout':
// $this->connectionTimeout = $value;
@@ -267,6 +287,7 @@ class Client implements ServerClient
$options = array();
$options['classmap'] = $this->getClassmap();
+ $options['typemap'] = $this->getTypemap();
$options['encoding'] = $this->getEncoding();
$options['soap_version'] = $this->getSoapVersion();
$options['wsdl'] = $this->getWSDL();
@@ -312,18 +333,19 @@ class Client implements ServerClient
* Set SOAP version
*
* @param int $version One of the SOAP_1_1 or SOAP_1_2 constants
- * @return Client
+ * @return self
* @throws Exception\InvalidArgumentException with invalid soap version argument
*/
public function setSoapVersion($version)
{
if (!in_array($version, array(SOAP_1_1, SOAP_1_2))) {
- throw new Exception\InvalidArgumentException('Invalid soap version specified. Use SOAP_1_1 or SOAP_1_2 constants.');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid soap version specified. Use SOAP_1_1 or SOAP_1_2 constants.'
+ );
}
- $this->soapVersion = $version;
-
- $this->soapClient = null;
+ $this->soapVersion = $version;
+ $this->soapClient = null;
return $this;
}
@@ -341,20 +363,19 @@ class Client implements ServerClient
* Set classmap
*
* @param array $classmap
- * @return Client
+ * @return self
* @throws Exception\InvalidArgumentException for any invalid class in the class map
*/
public function setClassmap(array $classmap)
{
foreach ($classmap as $class) {
if (!class_exists($class)) {
- throw new Exception\InvalidArgumentException('Invalid class in class map');
+ throw new Exception\InvalidArgumentException('Invalid class in class map: ' . $class);
}
}
$this->classmap = $classmap;
$this->soapClient = null;
-
return $this;
}
@@ -368,11 +389,44 @@ class Client implements ServerClient
return $this->classmap;
}
+ /**
+ * Set typemap with xml to php type mappings with appropriate validation.
+ *
+ * @param array $typeMap
+ * @return self
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setTypemap(array $typeMap)
+ {
+ foreach ($typeMap as $type) {
+ if (!is_callable($type['from_xml'])) {
+ throw new Exception\InvalidArgumentException('Invalid from_xml callback for type: ' . $type['type_name']);
+ }
+ if (!is_callable($type['to_xml'])) {
+ throw new Exception\InvalidArgumentException('Invalid to_xml callback for type: ' . $type['type_name']);
+ }
+ }
+
+ $this->typemap = $typeMap;
+ $this->soapClient = null;
+ return $this;
+ }
+
+ /**
+ * Retrieve typemap
+ *
+ * @return array
+ */
+ public function getTypemap()
+ {
+ return $this->typemap;
+ }
+
/**
* Set encoding
*
* @param string $encoding
- * @return Client
+ * @return self
* @throws Exception\InvalidArgumentException with invalid encoding argument
*/
public function setEncoding($encoding)
@@ -381,10 +435,8 @@ class Client implements ServerClient
throw new Exception\InvalidArgumentException('Invalid encoding specified');
}
- $this->encoding = $encoding;
-
+ $this->encoding = $encoding;
$this->soapClient = null;
-
return $this;
}
@@ -411,9 +463,7 @@ class Client implements ServerClient
if ($scheme === false || $scheme === null) {
throw new Exception\InvalidArgumentException('Invalid URN');
}
-
return true;
-
}
/**
@@ -422,16 +472,14 @@ class Client implements ServerClient
* URI in Web Service the target namespace
*
* @param string $uri
- * @return Client
- * @throws Exception\ExceptionInterface with invalid uri argument
+ * @return self
+ * @throws Exception\InvalidArgumentException with invalid uri argument
*/
public function setUri($uri)
{
$this->validateUrn($uri);
- $this->uri = $uri;
-
+ $this->uri = $uri;
$this->soapClient = null;
-
return $this;
}
@@ -451,16 +499,14 @@ class Client implements ServerClient
* URI in Web Service the target namespace
*
* @param string $location
- * @return Client
- * @throws Exception\ExceptionInterface with invalid uri argument
+ * @return self
+ * @throws Exception\InvalidArgumentException with invalid uri argument
*/
public function setLocation($location)
{
$this->validateUrn($location);
- $this->location = $location;
-
+ $this->location = $location;
$this->soapClient = null;
-
return $this;
}
@@ -478,19 +524,19 @@ class Client implements ServerClient
* Set request style
*
* @param int $style One of the SOAP_RPC or SOAP_DOCUMENT constants
- * @return Client
+ * @return self
* @throws Exception\InvalidArgumentException with invalid style argument
*/
public function setStyle($style)
{
if (!in_array($style, array(SOAP_RPC, SOAP_DOCUMENT))) {
- throw new Exception\InvalidArgumentException('Invalid request style specified. Use SOAP_RPC or SOAP_DOCUMENT constants.');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid request style specified. Use SOAP_RPC or SOAP_DOCUMENT constants.'
+ );
}
- $this->style = $style;
-
+ $this->style = $style;
$this->soapClient = null;
-
return $this;
}
@@ -508,19 +554,19 @@ class Client implements ServerClient
* Set message encoding method
*
* @param int $use One of the SOAP_ENCODED or SOAP_LITERAL constants
- * @return Client
+ * @return self
* @throws Exception\InvalidArgumentException with invalid message encoding method argument
*/
public function setEncodingMethod($use)
{
if (!in_array($use, array(SOAP_ENCODED, SOAP_LITERAL))) {
- throw new Exception\InvalidArgumentException('Invalid message encoding method. Use SOAP_ENCODED or SOAP_LITERAL constants.');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid message encoding method. Use SOAP_ENCODED or SOAP_LITERAL constants.'
+ );
}
- $this->use = $use;
-
+ $this->use = $use;
$this->soapClient = null;
-
return $this;
}
@@ -538,14 +584,12 @@ class Client implements ServerClient
* Set HTTP login
*
* @param string $login
- * @return Client
+ * @return self
*/
public function setHttpLogin($login)
{
- $this->login = $login;
-
+ $this->login = $login;
$this->soapClient = null;
-
return $this;
}
@@ -563,14 +607,12 @@ class Client implements ServerClient
* Set HTTP password
*
* @param string $password
- * @return Client
+ * @return self
*/
public function setHttpPassword($password)
{
- $this->password = $password;
-
+ $this->password = $password;
$this->soapClient = null;
-
return $this;
}
@@ -588,14 +630,12 @@ class Client implements ServerClient
* Set proxy host
*
* @param string $proxyHost
- * @return Client
+ * @return self
*/
public function setProxyHost($proxyHost)
{
- $this->proxyHost = $proxyHost;
-
+ $this->proxyHost = $proxyHost;
$this->soapClient = null;
-
return $this;
}
@@ -613,14 +653,12 @@ class Client implements ServerClient
* Set proxy port
*
* @param int $proxyPort
- * @return Client
+ * @return self
*/
public function setProxyPort($proxyPort)
{
- $this->proxyPort = (int) $proxyPort;
-
+ $this->proxyPort = (int) $proxyPort;
$this->soapClient = null;
-
return $this;
}
@@ -638,14 +676,12 @@ class Client implements ServerClient
* Set proxy login
*
* @param string $proxyLogin
- * @return Client
+ * @return self
*/
public function setProxyLogin($proxyLogin)
{
$this->proxyLogin = $proxyLogin;
-
$this->soapClient = null;
-
return $this;
}
@@ -663,14 +699,12 @@ class Client implements ServerClient
* Set proxy password
*
* @param string $proxyPassword
- * @return Client
+ * @return self
*/
public function setProxyPassword($proxyPassword)
{
$this->proxyPassword = $proxyPassword;
-
- $this->soapClient = null;
-
+ $this->soapClient = null;
return $this;
}
@@ -678,7 +712,7 @@ class Client implements ServerClient
* Set HTTPS client certificate path
*
* @param string $localCert local certificate path
- * @return Client
+ * @return self
* @throws Exception\InvalidArgumentException with invalid local certificate path argument
*/
public function setHttpsCertificate($localCert)
@@ -687,10 +721,8 @@ class Client implements ServerClient
throw new Exception\InvalidArgumentException('Invalid HTTPS client certificate path.');
}
- $this->localCert = $localCert;
-
+ $this->localCert = $localCert;
$this->soapClient = null;
-
return $this;
}
@@ -708,14 +740,12 @@ class Client implements ServerClient
* Set HTTPS client certificate passphrase
*
* @param string $passphrase
- * @return Client
+ * @return self
*/
public function setHttpsCertPassphrase($passphrase)
{
$this->passphrase = $passphrase;
-
$this->soapClient = null;
-
return $this;
}
@@ -733,7 +763,7 @@ class Client implements ServerClient
* Set compression options
*
* @param int|null $compressionOptions
- * @return Client
+ * @return self
*/
public function setCompressionOptions($compressionOptions)
{
@@ -771,8 +801,8 @@ class Client implements ServerClient
* Set Stream Context
*
* @param resource $context
- * @return Client
- * @throws Exception\InvalidArgumentException if $context is not a valid stream resource
+ * @return self
+ * @throws Exception\InvalidArgumentException
*/
public function setStreamContext($context)
{
@@ -798,12 +828,11 @@ class Client implements ServerClient
* Set the SOAP Feature options.
*
* @param string|int $feature
- * @return Client
+ * @return self
*/
public function setSoapFeatures($feature)
{
- $this->features = $feature;
-
+ $this->features = $feature;
$this->soapClient = null;
return $this;
}
@@ -821,16 +850,18 @@ class Client implements ServerClient
/**
* Set the SOAP WSDL Caching Options
*
- * @param string|int|bool|null $caching
- * @return Client
+ * @param string|int|bool|null $caching
+ * @return self
*/
public function setWSDLCache($caching)
{
+ //@todo check WSDL_CACHE_* constants?
if ($caching === null) {
$this->cacheWsdl = null;
} else {
$this->cacheWsdl = (int) $caching;
}
+
return $this;
}
@@ -848,7 +879,7 @@ class Client implements ServerClient
* Set the string to use in User-Agent header
*
* @param string|null $userAgent
- * @return Client
+ * @return self
*/
public function setUserAgent($userAgent)
{
@@ -857,6 +888,7 @@ class Client implements ServerClient
} else {
$this->userAgent = (string) $userAgent;
}
+
return $this;
}
@@ -894,7 +926,6 @@ class Client implements ServerClient
if ($this->soapClient !== null) {
return $this->soapClient->__getLastResponse();
}
-
return '';
}
@@ -908,7 +939,6 @@ class Client implements ServerClient
if ($this->soapClient !== null) {
return $this->soapClient->__getLastRequestHeaders();
}
-
return '';
}
@@ -922,7 +952,6 @@ class Client implements ServerClient
if ($this->soapClient !== null) {
return $this->soapClient->__getLastResponseHeaders();
}
-
return '';
}
@@ -941,20 +970,19 @@ class Client implements ServerClient
*
* May be overridden in subclasses
*
- * @internal
- * @param Client\Common $client
- * @param string $request
- * @param string $location
- * @param string $action
- * @param int $version
- * @param int $oneWay
+ * @param Client\Common $client
+ * @param string $request
+ * @param string $location
+ * @param string $action
+ * @param int $version
+ * @param int $oneWay
* @return mixed
*/
- public function _doRequest(Client\Common $client, $request, $location, $action, $version, $oneWay = null)
+ public function _doRequest(Client\Common $client, $request, $location,$action, $version, $oneWay = null)
{
// Perform request as is
if ($oneWay === null) {
- return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
+ return call_user_func(array($client, 'SoapClient::__doRequest'), $request, $location, $action, $version);
}
return call_user_func(array($client, 'SoapClient::__doRequest'), $request, $location, $action, $version, $oneWay);
}
@@ -971,17 +999,17 @@ class Client implements ServerClient
if ($wsdl == null) {
if (!isset($options['location'])) {
- throw new Exception\UnexpectedValueException('\'location\' parameter is required in non-WSDL mode.');
+ throw new Exception\UnexpectedValueException('"location" parameter is required in non-WSDL mode.');
}
if (!isset($options['uri'])) {
- throw new Exception\UnexpectedValueException('\'uri\' parameter is required in non-WSDL mode.');
+ throw new Exception\UnexpectedValueException('"uri" parameter is required in non-WSDL mode.');
}
} else {
if (isset($options['use'])) {
- throw new Exception\UnexpectedValueException('\'use\' parameter only works in non-WSDL mode.');
+ throw new Exception\UnexpectedValueException('"use" parameter only works in non-WSDL mode.');
}
if (isset($options['style'])) {
- throw new Exception\UnexpectedValueException('\'style\' parameter only works in non-WSDL mode.');
+ throw new Exception\UnexpectedValueException('"style" parameter only works in non-WSDL mode.');
}
}
unset($options['wsdl']);
@@ -995,7 +1023,7 @@ class Client implements ServerClient
*
* My be overridden in descendant classes
*
- * @param array $arguments
+ * @param array $arguments
* @return array
*/
protected function _preProcessArguments($arguments)
@@ -1009,7 +1037,7 @@ class Client implements ServerClient
*
* My be overridden in descendant classes
*
- * @param array $result
+ * @param array $result
* @return array
*/
protected function _preProcessResult($result)
@@ -1021,9 +1049,9 @@ class Client implements ServerClient
/**
* Add SOAP input header
*
- * @param SoapHeader $header
+ * @param SoapHeader $header
* @param bool $permanent
- * @return Client
+ * @return self
*/
public function addSoapInputHeader(SoapHeader $header, $permanent = false)
{
@@ -1032,20 +1060,18 @@ class Client implements ServerClient
} else {
$this->soapInputHeaders[] = $header;
}
-
return $this;
}
/**
* Reset SOAP input headers
*
- * @return Client
+ * @return self
*/
public function resetSoapInputHeaders()
{
$this->permanentSoapInputHeaders = array();
- $this->soapInputHeaders = array();
-
+ $this->soapInputHeaders = array();
return $this;
}
@@ -1062,8 +1088,8 @@ class Client implements ServerClient
/**
* Perform a SOAP call
*
- * @param string $name
- * @param array $arguments
+ * @param string $name
+ * @param array $arguments
* @return mixed
*/
public function __call($name, $arguments)
@@ -1076,11 +1102,13 @@ class Client implements ServerClient
$this->lastMethod = $name;
$soapHeaders = array_merge($this->permanentSoapInputHeaders, $this->soapInputHeaders);
- $result = $soapClient->__soapCall($name,
- $this->_preProcessArguments($arguments),
- null, /* Options are already set to the SOAP client object */
- (count($soapHeaders) > 0)? $soapHeaders : null,
- $this->soapOutputHeaders);
+ $result = $soapClient->__soapCall(
+ $name,
+ $this->_preProcessArguments($arguments),
+ null, /* Options are already set to the SOAP client object */
+ (count($soapHeaders) > 0)? $soapHeaders : null,
+ $this->soapOutputHeaders
+ );
// Reset non-permanent input headers
$this->soapInputHeaders = array();
@@ -1119,13 +1147,6 @@ class Client implements ServerClient
return $soapClient->__getFunctions();
}
-
- /**
- * Get used types.
- *
- * @return array
- */
-
/**
* Return a list of SOAP types
*
@@ -1142,13 +1163,14 @@ class Client implements ServerClient
}
$soapClient = $this->getSoapClient();
-
return $soapClient->__getTypes();
}
/**
- * @param SoapClient $soapClient
- * @return Client
+ * Set SoapClient object
+ *
+ * @param SoapClient $soapClient
+ * @return self
*/
public function setSoapClient(SoapClient $soapClient)
{
@@ -1157,6 +1179,8 @@ class Client implements ServerClient
}
/**
+ * Get SoapClient object
+ *
* @return SoapClient
*/
public function getSoapClient()
@@ -1168,9 +1192,11 @@ class Client implements ServerClient
}
/**
- * @param string $cookieName
- * @param string $cookieValue
- * @return Client
+ * Set cookie
+ *
+ * @param string $cookieName
+ * @param string $cookieValue
+ * @return self
*/
public function setCookie($cookieName, $cookieValue=null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php
index be9edae1a365b96e3cb073547ebc34d8fc28da20..bf9eb5c8841f191ca37eab32f672df5d0eab79cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php
@@ -9,9 +9,11 @@
namespace Zend\Soap\Client;
+use SoapClient;
+
if (extension_loaded('soap')) {
-class Common extends \SoapClient
+class Common extends SoapClient
{
/**
* doRequest() pre-processing method
@@ -30,19 +32,19 @@ class Common extends \SoapClient
public function __construct($doRequestCallback, $wsdl, $options)
{
$this->doRequestCallback = $doRequestCallback;
-
parent::__construct($wsdl, $options);
}
/**
* Performs SOAP request over HTTP.
- * Overridden to implement different transport layers, perform additional XML processing or other purpose.
+ * Overridden to implement different transport layers, perform additional
+ * XML processing or other purpose.
*
- * @param string $request
- * @param string $location
- * @param string $action
- * @param int $version
- * @param int $oneWay
+ * @param string $request
+ * @param string $location
+ * @param string $action
+ * @param int $version
+ * @param int $oneWay
* @return mixed
*/
public function __doRequest($request, $location, $action, $version, $oneWay = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php
index 9228cec473baa969701ba36b9af071713fe0b9fe..b65e167be38e9a1b6850a86c5e0c02d34e8aba10 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php
@@ -19,10 +19,40 @@ use Zend\Uri\Http as HttpUri;
/**
* .NET SOAP client
*
- * Class is intended to be used with .Net Web Services.
+ * Class is intended to be used with .NET Web Services.
*/
class DotNet extends SOAPClient
{
+ /**
+ * Curl HTTP client adapter.
+ * @var CurlClient
+ */
+ protected $curlClient = null;
+
+ /**
+ * The last request headers.
+ * @var string
+ */
+ protected $lastRequestHeaders = '';
+
+ /**
+ * The last response headers.
+ * @var string
+ */
+ protected $lastResponseHeaders = '';
+
+ /**
+ * SOAP client options.
+ * @var array
+ */
+ protected $options = array();
+
+ /**
+ * Should NTLM authentication be used?
+ * @var boolean
+ */
+ protected $useNtlm = false;
+
/**
* Constructor
*
@@ -44,23 +74,28 @@ class DotNet extends SOAPClient
* @param string $request The request body.
* @param string $location The SOAP URI.
* @param string $action The SOAP action to call.
- * @param integer $version The SOAP version to use.
- * @param integer $one_way (Optional) The number 1 if a response is not expected.
+ * @param int $version The SOAP version to use.
+ * @param int $oneWay (Optional) The number 1 if a response is not expected.
* @return string The XML SOAP response.
*/
- public function _doRequest(CommonClient $client, $request, $location, $action, $version, $one_way = null)
+ public function _doRequest(CommonClient $client, $request, $location, $action, $version, $oneWay = null)
{
if (!$this->useNtlm) {
- return parent::_doRequest($client, $request, $location, $action, $version, $one_way);
+ return parent::_doRequest($client, $request, $location, $action, $version, $oneWay);
}
$curlClient = $this->getCurlClient();
- $headers = array('Content-Type' => 'text/xml; charset=utf-8',
- 'Method' => 'POST',
- 'SOAPAction' => '"' . $action . '"',
- 'User-Agent' => 'PHP-SOAP-CURL');
- $uri = new HttpUri($location);
+ // @todo persistent connection ?
+ $headers = array(
+ 'Content-Type' => 'text/xml; charset=utf-8',
+ 'Method' => 'POST',
+ 'SOAPAction' => '"' . $action . '"',
+ 'User-Agent' => 'PHP-SOAP-CURL',
+ );
+ $uri = new HttpUri($location);
+
+ // @todo use parent set* options for ssl certificate authorization
$curlClient->setCurlOption(CURLOPT_HTTPAUTH, CURLAUTH_NTLM)
->setCurlOption(CURLOPT_SSL_VERIFYHOST, false)
->setCurlOption(CURLOPT_SSL_VERIFYPEER, false)
@@ -70,6 +105,8 @@ class DotNet extends SOAPClient
$curlClient->connect($uri->getHost(), $uri->getPort());
$curlClient->write('POST', $uri, 1.1, $headers, $request);
$response = HttpResponse::fromString($curlClient->read());
+
+ // @todo persistent connection ?
$curlClient->close();
// Save headers
@@ -83,14 +120,13 @@ class DotNet extends SOAPClient
/**
* Returns the cURL client that is being used.
*
- * @return \Zend\Http\Client\Adapter\Curl The cURL client.
+ * @return CurlClient
*/
public function getCurlClient()
{
if ($this->curlClient === null) {
$this->curlClient = new CurlClient();
}
-
return $this->curlClient;
}
@@ -118,7 +154,7 @@ class DotNet extends SOAPClient
* Sets the cURL client to use.
*
* @param CurlClient $curlClient The cURL client.
- * @return self Fluent interface.
+ * @return self
*/
public function setCurlClient(CurlClient $curlClient)
{
@@ -133,7 +169,7 @@ class DotNet extends SOAPClient
*
* @param array|\Traversable $options Options.
* @throws \InvalidArgumentException If an unsupported option is passed.
- * @return self Fluent interface.
+ * @return self
*/
public function setOptions($options)
{
@@ -151,16 +187,18 @@ class DotNet extends SOAPClient
*
* My be overridden in descendant classes
*
- * @param array $arguments
- * @throws Exception\RuntimeException
+ * @param array $arguments
* @return array
+ * @throws Exception\RuntimeException
*/
protected function _preProcessArguments($arguments)
{
if (count($arguments) > 1 ||
(count($arguments) == 1 && !is_array(reset($arguments)))
) {
- throw new Exception\RuntimeException('.Net webservice arguments have to be grouped into array: array(\'a\' => $a, \'b\' => $b, ...).');
+ throw new Exception\RuntimeException(
+ '.Net webservice arguments have to be grouped into array: array("a" => $a, "b" => $b, ...).'
+ );
}
// Do nothing
@@ -172,13 +210,12 @@ class DotNet extends SOAPClient
*
* My be overridden in descendant classes
*
- * @param object $result
+ * @param object $result
* @return mixed
*/
protected function _preProcessResult($result)
{
$resultProperty = $this->getLastMethod() . 'Result';
-
return $result->$resultProperty;
}
@@ -188,7 +225,7 @@ class DotNet extends SOAPClient
* @param array $headers The headers to flatten.
* @return string The headers string.
*/
- private function flattenHeaders(array $headers)
+ protected function flattenHeaders(array $headers)
{
$result = '';
@@ -198,39 +235,4 @@ class DotNet extends SOAPClient
return $result;
}
-
- /**
- * Curl HTTP client adapter.
- *
- * @var \Zend\Http\Client\Adapter\Curl
- */
- private $curlClient = null;
-
- /**
- * The last request headers.
- *
- * @var string
- */
- private $lastRequestHeaders = '';
-
- /**
- * The last response headers.
- *
- * @var string
- */
- private $lastResponseHeaders = '';
-
- /**
- * SOAP client options.
- *
- * @var array
- */
- private $options = array();
-
- /**
- * Should NTLM authentication be used?
- *
- * @var boolean
- */
- private $useNtlm = false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php
index ea71218054fb437dd2c2eb54b86573e241626e42..6c6342065c37395aa2fdc8ea9bb604f2266d8688 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php
@@ -13,8 +13,6 @@ use Zend\Soap\Client as SOAPClient;
use Zend\Soap\Server as SOAPServer;
/**
- * \Zend\Soap\Client\Local
- *
* Class is intended to be used as local SOAP client which works
* with a provided Server object.
*
@@ -24,15 +22,14 @@ class Local extends SOAPClient
{
/**
* Server object
- *
- * @var \Zend\Soap\Server
+ * @var SOAPServer
*/
protected $server;
/**
* Local client constructor
*
- * @param \Zend\Soap\Server $server
+ * @param SOAPServer $server
* @param string $wsdl
* @param array $options
*/
@@ -49,13 +46,12 @@ class Local extends SOAPClient
/**
* Actual "do request" method.
*
- * @internal
- * @param \Zend\Soap\Client\Common $client
- * @param string $request
- * @param string $location
- * @param string $action
- * @param int $version
- * @param int $oneWay
+ * @param Common $client
+ * @param string $request
+ * @param string $location
+ * @param string $action
+ * @param int $version
+ * @param int $oneWay
* @return mixed
*/
public function _doRequest(Common $client, $request, $location, $action, $version, $oneWay = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php
index 735857f0bffd4a7d1a7fab75f0d9b4f8ccbebd53..30af2d0cfaba8b4d68e26e6a517440d4f48ce733 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php
@@ -9,7 +9,10 @@
namespace Zend\Soap\Exception;
-class BadMethodCallException
- extends \BadMethodCallException
- implements ExceptionInterface
+use BadMethodCallException as SPLBadMethodCallException;
+
+/**
+ * Exception thrown when unrecognized method is called via overloading
+ */
+class BadMethodCallException extends SPLBadMethodCallException implements ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php
index f54d014b0b64918ce84ec636804a6829685ecd8b..e1bc31c0e49c4f759b0adb0421a59c2e5d4ef28d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php
@@ -9,5 +9,8 @@
namespace Zend\Soap\Exception;
+/**
+ * Common Exception interface
+ */
interface ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
index 272eb381601a62a292c82096882755e44a049700..94bb9efe77098afcd6c84b65e366325d8b691fd3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
@@ -9,5 +9,10 @@
namespace Zend\Soap\Exception;
+use RuntimeException;
+
+/**
+ * Exception thrown when SOAP PHP extension is not loaded
+ */
class ExtensionNotLoadedException extends RuntimeException
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php
index 6308e6de087eacc2d8b73b959b9115c8983c9341..c71eec6f64b6385601ba7251059ba65a91172abc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php
@@ -9,7 +9,10 @@
namespace Zend\Soap\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
+use InvalidArgumentException as SPLInvalidArgumentException;
+
+/**
+ * Exception thrown when one or more method arguments are invalid
+ */
+class InvalidArgumentException extends SPLInvalidArgumentException implements ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php
index 75db3716f5f756151ad2d16ebce3393eddc53374..b1290234cf156281a65873fe24c025cb1402ee0e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php
@@ -9,7 +9,10 @@
namespace Zend\Soap\Exception;
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
+use RuntimeException as SPLRuntimeException;
+
+/**
+ * Exception thrown when there is an error during program execution
+ */
+class RuntimeException extends SPLRuntimeException implements ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php
index f5b0b2f617cc3c2f6b5e8052c7af62022a688db9..a3133d351d76fcf839534e552dba5589c63d8676 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php
@@ -9,7 +9,10 @@
namespace Zend\Soap\Exception;
-class UnexpectedValueException
- extends \UnexpectedValueException
- implements ExceptionInterface
+use UnexpectedValueException as SPLUnexpectedValueException;
+
+/**
+ * Exception thrown when provided arguments are invalid
+ */
+class UnexpectedValueException extends SPLUnexpectedValueException implements ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Server.php b/vendor/zendframework/zendframework/library/Zend/Soap/Server.php
index 151b3f459180ff06a09a036a20660c3b8a04f16e..5d276a26c2fb9af693953c738f853f0f1581b372 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Server.php
@@ -9,18 +9,17 @@
namespace Zend\Soap;
+use SoapServer;
+use SoapFault;
+use Traversable;
use DOMDocument;
use DOMNode;
use SimpleXMLElement;
-use SoapFault;
-use stdClass;
-use Traversable;
+use ReflectionClass;
+use Zend\Server\Server as ZendServerServer;
use Zend\Stdlib\ArrayUtils;
-/**
- * Zend_Soap_Server
- */
-class Server implements \Zend\Server\Server
+class Server implements ZendServerServer
{
/**
* Actor URI
@@ -40,11 +39,6 @@ class Server implements \Zend\Server\Server
*/
protected $classArgs = array();
- /**
- * Object registered with this server
- */
- protected $object;
-
/**
* Array of SOAP type => PHP class pairings for handling return/incoming values
* @var array
@@ -58,32 +52,27 @@ class Server implements \Zend\Server\Server
protected $encoding;
/**
- * SOAP Server Features
- *
- * @var int
+ * Registered fault exceptions
+ * @var array
*/
- protected $features;
+ protected $faultExceptions = array();
/**
- * WSDL Caching Options of SOAP Server
- *
- * @var mixed
+ * SOAP Server Features
+ * @var int
*/
- protected $wsdlCache;
-
+ protected $features;
/**
- * Registered fault exceptions
- * @var array
+ * Functions registered with this server; may be either an array or the SOAP_FUNCTIONS_ALL constant
+ * @var array|int
*/
- protected $faultExceptions = array();
+ protected $functions = array();
/**
- * Functions registered with this server; may be either an array or the SOAP_FUNCTIONS_ALL
- * constant
- * @var array|int
+ * Object registered with this server
*/
- protected $functions = array();
+ protected $object;
/**
* Persistence mode; should be one of the SOAP persistence constants
@@ -104,8 +93,7 @@ class Server implements \Zend\Server\Server
protected $response;
/**
- * Flag: whether or not {@link handle()} should return a response instead
- * of automatically emitting it.
+ * Flag: whether or not {@link handle()} should return a response instead of automatically emitting it.
* @var bool
*/
protected $returnResponse = false;
@@ -117,10 +105,10 @@ class Server implements \Zend\Server\Server
protected $soapVersion = SOAP_1_2;
/**
- * URI or path to WSDL
- * @var string
+ * Array of type mappings
+ * @var array
*/
- protected $wsdl;
+ protected $typemap;
/**
* URI namespace for SOAP server
@@ -128,6 +116,18 @@ class Server implements \Zend\Server\Server
*/
protected $uri;
+ /**
+ * URI or path to WSDL
+ * @var string
+ */
+ protected $wsdl;
+
+ /**
+ * WSDL Caching Options of SOAP Server
+ * @var mixed
+ */
+ protected $wsdlCache;
+
/**
* Constructor
*
@@ -138,8 +138,8 @@ class Server implements \Zend\Server\Server
* If $wsdl is provided, it is passed on to {@link setWSDL()}; if any
* options are specified, they are passed on to {@link setOptions()}.
*
- * @param string $wsdl
- * @param array $options
+ * @param string $wsdl
+ * @param array $options
* @throws Exception\ExtensionNotLoadedException
*/
public function __construct($wsdl = null, array $options = null)
@@ -162,8 +162,8 @@ class Server implements \Zend\Server\Server
*
* Allows setting options as an associative array of option => value pairs.
*
- * @param array|Traversable $options
- * @return \Zend\Soap\Server
+ * @param array|\Traversable $options
+ * @return self
*/
public function setOptions($options)
{
@@ -172,33 +172,46 @@ class Server implements \Zend\Server\Server
}
foreach ($options as $key => $value) {
- switch ($key) {
+ switch (strtolower($key)) {
case 'actor':
$this->setActor($value);
break;
+
case 'classmap':
- case 'classMap':
+ case 'class_map':
$this->setClassmap($value);
break;
+
+ case 'typemap':
+ case 'type_map':
+ $this->setTypemap($value);
+ break;
+
case 'encoding':
$this->setEncoding($value);
break;
- case 'soapVersion':
+
+ case 'soapversion':
case 'soap_version':
$this->setSoapVersion($value);
break;
+
case 'uri':
$this->setUri($value);
break;
+
case 'wsdl':
$this->setWSDL($value);
break;
- case 'features':
- $this->setSoapFeatures($value);
- break;
+
case 'cache_wsdl':
$this->setWSDLCache($value);
break;
+
+ case 'features':
+ $this->setSoapFeatures($value);
+ break;
+
default:
break;
}
@@ -216,31 +229,35 @@ class Server implements \Zend\Server\Server
{
$options = array();
if (null !== $this->actor) {
- $options['actor'] = $this->actor;
+ $options['actor'] = $this->getActor();
}
if (null !== $this->classmap) {
- $options['classmap'] = $this->classmap;
+ $options['classmap'] = $this->getClassmap();
+ }
+
+ if (null !== $this->typemap) {
+ $options['typemap'] = $this->getTypemap();
}
if (null !== $this->encoding) {
- $options['encoding'] = $this->encoding;
+ $options['encoding'] = $this->getEncoding();
}
if (null !== $this->soapVersion) {
- $options['soap_version'] = $this->soapVersion;
+ $options['soap_version'] = $this->getSoapVersion();
}
if (null !== $this->uri) {
- $options['uri'] = $this->uri;
+ $options['uri'] = $this->getUri();
}
if (null !== $this->features) {
- $options['features'] = $this->features;
+ $options['features'] = $this->getSoapFeatures();
}
if (null !== $this->wsdlCache) {
- $options['cache_wsdl'] = $this->wsdlCache;
+ $options['cache_wsdl'] = $this->getWSDLCache();
}
return $options;
@@ -250,7 +267,7 @@ class Server implements \Zend\Server\Server
* Set encoding
*
* @param string $encoding
- * @return Server
+ * @return self
* @throws Exception\InvalidArgumentException with invalid encoding argument
*/
public function setEncoding($encoding)
@@ -277,7 +294,7 @@ class Server implements \Zend\Server\Server
* Set SOAP version
*
* @param int $version One of the SOAP_1_1 or SOAP_1_2 constants
- * @return Server
+ * @return self
* @throws Exception\InvalidArgumentException with invalid soap version argument
*/
public function setSoapVersion($version)
@@ -323,7 +340,7 @@ class Server implements \Zend\Server\Server
* Actor is the actor URI for the server.
*
* @param string $actor
- * @return Server
+ * @return self
*/
public function setActor($actor)
{
@@ -348,7 +365,7 @@ class Server implements \Zend\Server\Server
* URI in SoapServer is actually the target namespace, not a URI; $uri must begin with 'urn:'.
*
* @param string $uri
- * @return Server
+ * @return self
*/
public function setUri($uri)
{
@@ -371,7 +388,7 @@ class Server implements \Zend\Server\Server
* Set classmap
*
* @param array $classmap
- * @return Server
+ * @return self
* @throws Exception\InvalidArgumentException for any invalid class in the class map
*/
public function setClassmap($classmap)
@@ -399,11 +416,47 @@ class Server implements \Zend\Server\Server
return $this->classmap;
}
+ /**
+ * Set typemap with xml to php type mappings with appropriate validation.
+ *
+ * @param array $typeMap
+ * @return self
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setTypemap($typeMap)
+ {
+ if (!is_array($typeMap)) {
+ throw new Exception\InvalidArgumentException('Typemap must be an array');
+ }
+
+ foreach ($typeMap as $type) {
+ if (!is_callable($type['from_xml'])) {
+ throw new Exception\InvalidArgumentException('Invalid from_xml callback for type: ' . $type['type_name']);
+ }
+ if (!is_callable($type['to_xml'])) {
+ throw new Exception\InvalidArgumentException('Invalid to_xml callback for type: ' . $type['type_name']);
+ }
+ }
+
+ $this->typemap = $typeMap;
+ return $this;
+ }
+
+ /**
+ * Retrieve typemap
+ *
+ * @return array
+ */
+ public function getTypemap()
+ {
+ return $this->typemap;
+ }
+
/**
* Set wsdl
*
- * @param string $wsdl URI or path to a WSDL
- * @return Server
+ * @param string $wsdl URI or path to a WSDL
+ * @return self
*/
public function setWSDL($wsdl)
{
@@ -425,7 +478,7 @@ class Server implements \Zend\Server\Server
* Set the SOAP Feature options.
*
* @param string|int $feature
- * @return Server
+ * @return self
*/
public function setSoapFeatures($feature)
{
@@ -446,8 +499,8 @@ class Server implements \Zend\Server\Server
/**
* Set the SOAP WSDL Caching Options
*
- * @param string|int|bool $options
- * @return Server
+ * @param string|int|bool $options
+ * @return self
*/
public function setWSDLCache($options)
{
@@ -466,10 +519,10 @@ class Server implements \Zend\Server\Server
/**
* Attach a function as a server method
*
- * @param array|string $function Function name, array of function names to attach,
- * or SOAP_FUNCTIONS_ALL to attach all functions
+ * @param array|string $function Function name, array of function names to attach,
+ * or SOAP_FUNCTIONS_ALL to attach all functions
* @param string $namespace Ignored
- * @return Server
+ * @return self
* @throws Exception\InvalidArgumentException on invalid functions
*/
public function addFunction($function, $namespace = '')
@@ -487,11 +540,13 @@ class Server implements \Zend\Server\Server
throw new Exception\InvalidArgumentException('One or more invalid functions specified in array');
}
}
- $this->functions = array_merge($this->functions, $function);
+
} elseif (is_string($function) && function_exists($function)) {
$this->functions[] = $function;
+
} elseif ($function == SOAP_FUNCTIONS_ALL) {
$this->functions = SOAP_FUNCTIONS_ALL;
+
} else {
throw new Exception\InvalidArgumentException('Invalid function specified');
}
@@ -509,14 +564,14 @@ class Server implements \Zend\Server\Server
* Accepts a class name to use when handling requests. Any additional
* arguments will be passed to that class' constructor when instantiated.
*
- * See {@link setObject()} to set preconfigured object instances as request handlers.
+ * See {@link setObject()} to set pre-configured object instances as request handlers.
*
- * @param string|object $class Class name or object instance which executes SOAP Requests at endpoint.
- * @param string $namespace
- * @param $argv
- * @return Server
- * @throws Exception\InvalidArgumentException if called more than once, or if class
- * does not exist
+ * @param string|object $class Class name or object instance which executes
+ * SOAP Requests at endpoint.
+ * @param string $namespace
+ * @param null|array $argv
+ * @return self
+ * @throws Exception\InvalidArgumentException if called more than once, or if class does not exist
*/
public function setClass($class, $namespace = '', $argv = null)
{
@@ -554,11 +609,11 @@ class Server implements \Zend\Server\Server
/**
* Attach an object to a server
*
- * Accepts an instanciated object to use when handling requests.
+ * Accepts an instantiated object to use when handling requests.
*
- * @param object $object
+ * @param object $object
+ * @return self
* @throws Exception\InvalidArgumentException
- * @return Server
*/
public function setObject($object)
{
@@ -576,7 +631,6 @@ class Server implements \Zend\Server\Server
}
$this->object = $object;
-
return $this;
}
@@ -587,7 +641,6 @@ class Server implements \Zend\Server\Server
* merged with all public methods of the class set with {@link setClass()}
* (if any).
*
- * @access public
* @return array
*/
public function getFunctions()
@@ -605,8 +658,7 @@ class Server implements \Zend\Server\Server
/**
* Unimplemented: Load server definition
*
- * @param array $definition
- * @return void
+ * @param array $definition
* @throws Exception\RuntimeException Unimplemented
*/
public function loadFunctions($definition)
@@ -617,9 +669,9 @@ class Server implements \Zend\Server\Server
/**
* Set server persistence
*
- * @param int $mode
+ * @param int $mode SOAP_PERSISTENCE_SESSION or SOAP_PERSISTENCE_REQUEST constants
+ * @return self
* @throws Exception\InvalidArgumentException
- * @return Server
*/
public function setPersistence($mode)
{
@@ -651,38 +703,49 @@ class Server implements \Zend\Server\Server
* - stdClass; if so, calls __toString() and verifies XML
* - string; if so, verifies XML
*
- * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request
+ * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request
+ * @return self
* @throws Exception\InvalidArgumentException
- * @return Server
*/
protected function _setRequest($request)
{
+ $xml = null;
+
if ($request instanceof DOMDocument) {
$xml = $request->saveXML();
+
} elseif ($request instanceof DOMNode) {
$xml = $request->ownerDocument->saveXML();
+
} elseif ($request instanceof SimpleXMLElement) {
$xml = $request->asXML();
+
} elseif (is_object($request) || is_string($request)) {
if (is_object($request)) {
$xml = $request->__toString();
} else {
$xml = $request;
}
+ $xml = trim($xml);
+
libxml_disable_entity_loader(true);
+
$dom = new DOMDocument();
- if (strlen($xml) == 0 || !$dom->loadXML($xml)) {
+ $loadStatus = $dom->loadXML($xml);
+
+ // @todo check libxml errors ? validate document ?
+ if (strlen($xml) == 0 || !$loadStatus) {
throw new Exception\InvalidArgumentException('Invalid XML');
}
+
foreach ($dom->childNodes as $child) {
if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
- throw new Exception\InvalidArgumentException(
- 'Invalid XML: Detected use of illegal DOCTYPE'
- );
+ throw new Exception\InvalidArgumentException('Invalid XML: Detected use of illegal DOCTYPE');
}
}
libxml_disable_entity_loader(false);
}
+
$this->request = $xml;
return $this;
}
@@ -706,7 +769,7 @@ class Server implements \Zend\Server\Server
* The response is always available via {@link getResponse()}.
*
* @param bool $flag
- * @return Server
+ * @return self
*/
public function setReturnResponse($flag = true)
{
@@ -741,12 +804,12 @@ class Server implements \Zend\Server\Server
* SoapServer object, and then registers any functions or class with it, as
* well as persistence.
*
- * @return \SoapServer
+ * @return SoapServer
*/
protected function _getSoap()
{
$options = $this->getOptions();
- $server = new \SoapServer($this->wsdl, $options);
+ $server = new SoapServer($this->wsdl, $options);
if (!empty($this->functions)) {
$server->addFunction($this->functions);
@@ -785,7 +848,7 @@ class Server implements \Zend\Server\Server
* If no request is passed, pulls request using php:://input (for
* cross-platform compatibility purposes).
*
- * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request Optional request
+ * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request Optional request
* @return void|string
*/
public function handle($request = null)
@@ -812,8 +875,7 @@ class Server implements \Zend\Server\Server
if ($setRequestException instanceof \Exception) {
// Create SOAP fault message if we've caught a request exception
$fault = $this->fault($setRequestException->getMessage(), 'Sender');
- }
- if (!$setRequestException instanceof \Exception) {
+ } else {
ob_start();
try {
$soap->handle($this->request);
@@ -830,12 +892,14 @@ class Server implements \Zend\Server\Server
// Send a fault, if we have one
if ($fault instanceof SoapFault && !$this->returnResponse) {
$soap->fault($fault->faultcode, $fault->getMessage());
+
return;
}
// Echo the response, if we're not returning it
if (!$this->returnResponse) {
echo $this->response;
+
return;
}
@@ -862,17 +926,46 @@ class Server implements \Zend\Server\Server
}
/**
- * Register a valid fault exception
+ * Validate and register fault exception
*
* @param string|array $class Exception class or array of exception classes
- * @return Server
+ * @return self
+ * @throws Exception\InvalidArgumentException
*/
public function registerFaultException($class)
{
- $this->faultExceptions = array_merge($this->faultExceptions, (array) $class);
+ if (is_array($class)) {
+ foreach($class as $row) {
+ $this->registerFaultException($row);
+ }
+
+ } elseif (is_string($class) && class_exists($class) && is_subclass_of($class, 'Exception')) {
+ $ref = new ReflectionClass($class);
+
+ $this->faultExceptions[] = $ref->getName();
+ $this->faultExceptions = array_unique($this->faultExceptions);
+ } else {
+ throw new Exception\InvalidArgumentException(
+ 'Argument for Zend\Soap\Server::registerFaultException should be string or array of strings with valid exception names'
+ );
+ }
+
return $this;
}
+ /**
+ * Checks if provided fault name is registered as valid in this server.
+ *
+ * @param $fault Name of a fault class
+ * @return bool
+ */
+ public function isRegisteredAsFaultException($fault)
+ {
+ $ref = new ReflectionClass($fault);
+ $classNames = $ref->getName();
+ return in_array($classNames, $this->faultExceptions);
+ }
+
/**
* Deregister a fault exception from the fault exception stack
*
@@ -914,11 +1007,10 @@ class Server implements \Zend\Server\Server
* @param string $code SOAP Fault Codes
* @return SoapFault
*/
- public function fault($fault = null, $code = "Receiver")
+ public function fault($fault = null, $code = 'Receiver')
{
if ($fault instanceof \Exception) {
- $class = get_class($fault);
- if (in_array($class, $this->faultExceptions)) {
+ if ($this->isRegisteredAsFaultException($fault)) {
$message = $fault->getMessage();
$eCode = $fault->getCode();
$code = empty($eCode) ? $code : $eCode;
@@ -931,12 +1023,9 @@ class Server implements \Zend\Server\Server
$message = 'Unknown error';
}
- $allowedFaultModes = array(
- 'VersionMismatch', 'MustUnderstand', 'DataEncodingUnknown',
- 'Sender', 'Receiver', 'Server'
- );
+ $allowedFaultModes = array('VersionMismatch', 'MustUnderstand', 'DataEncodingUnknown', 'Sender', 'Receiver', 'Server');
if (!in_array($code, $allowedFaultModes)) {
- $code = "Receiver";
+ $code = 'Receiver';
}
return new SoapFault($code, $message);
@@ -945,12 +1034,11 @@ class Server implements \Zend\Server\Server
/**
* Throw PHP errors as SoapFaults
*
- * @param int $errno
- * @param string $errstr
- * @param string $errfile
- * @param int $errline
- * @param array $errcontext
- * @return void
+ * @param int $errno
+ * @param string $errstr
+ * @param string $errfile
+ * @param int $errline
+ * @param array $errcontext
* @throws SoapFault
*/
public function handlePhpErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php b/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php
index 90b415fd03397b6c267e135b576ce221ba125c9a..7c30208bdbd40d1c99f54fc01f922d8bf36b287e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php
@@ -10,8 +10,7 @@
namespace Zend\Soap\Server;
use ReflectionObject;
-use Zend\Soap\Exception\BadMethodCallException;
-use Zend\Soap\Exception\UnexpectedValueException;
+use Zend\Soap\Exception;
/**
* Wraps WSDL Document/Literal Style service objects to hide SOAP request
@@ -60,11 +59,12 @@ use Zend\Soap\Exception\UnexpectedValueException;
* of SOAP this wrapper service handles the parsing between the formats.
*
* @example
- *
+ * <code>
* $service = new MyCalculatorService();
* $soap = new \Zend\Soap\Server($wsdlFile);
* $soap->setObject(new \Zend\Soap\Server\DocumentLiteralWrapper($service));
* $soap->handle();
+ * </code>
*/
class DocumentLiteralWrapper
{
@@ -92,8 +92,8 @@ class DocumentLiteralWrapper
/**
* Proxy method that does the heavy document/literal decomposing.
*
- * @param string $method
- * @param array $args
+ * @param string $method
+ * @param array $args
* @return mixed
*/
public function __call($method, $args)
@@ -102,7 +102,7 @@ class DocumentLiteralWrapper
$this->_assertServiceDelegateHasMethod($method);
$delegateArgs = $this->_parseArguments($method, $args[0]);
- $ret = call_user_func_array(array($this->object, $method), $delegateArgs);
+ $ret = call_user_func_array(array($this->object, $method), $delegateArgs);
return $this->_getResultMessage($method, $ret);
}
@@ -110,15 +110,14 @@ class DocumentLiteralWrapper
* Parse the document/literal wrapper into arguments to call the real
* service.
*
- * @param string $method
- * @param object $document
- * @throws UnexpectedValueException
+ * @param string $method
+ * @param object $document
* @return array
+ * @throws Exception\UnexpectedValueException
*/
protected function _parseArguments($method, $document)
{
$reflMethod = $this->reflection->getMethod($method);
- /* @var \Zend\Server\Reflection\ReflectionParameter[] $params */
$params = array();
foreach ($reflMethod->getParameters() as $param) {
$params[$param->getName()] = $param;
@@ -127,8 +126,8 @@ class DocumentLiteralWrapper
$delegateArgs = array();
foreach (get_object_vars($document) as $argName => $argValue) {
if (!isset($params[$argName])) {
- throw new UnexpectedValueException(sprintf(
- "Received unknown argument %s which is not an argument to %s::%s()",
+ throw new Exception\UnexpectedValueException(sprintf(
+ "Received unknown argument %s which is not an argument to %s::%s",
$argName,
get_class($this->object),
$method
@@ -136,18 +135,30 @@ class DocumentLiteralWrapper
}
$delegateArgs[$params[$argName]->getPosition()] = $argValue;
}
+
return $delegateArgs;
}
+ /**
+ * Returns result message content
+ *
+ * @param string $method
+ * @param mixed $ret
+ * @return array
+ */
protected function _getResultMessage($method, $ret)
{
return array($method . 'Result' => $ret);
}
+ /**
+ * @param string $method
+ * @throws Exception\BadMethodCallException
+ */
protected function _assertServiceDelegateHasMethod($method)
{
if (!$this->reflection->hasMethod($method)) {
- throw new BadMethodCallException(sprintf(
+ throw new Exception\BadMethodCallException(sprintf(
"Method %s does not exist on delegate object %s",
$method,
get_class($this->object)
@@ -155,10 +166,14 @@ class DocumentLiteralWrapper
}
}
- protected function _assertOnlyOneArgument($args)
+ /**
+ * @param array $args
+ * @throws Exception\UnexpectedValueException
+ */
+ protected function _assertOnlyOneArgument(array $args)
{
if (count($args) != 1) {
- throw new UnexpectedValueException(sprintf(
+ throw new Exception\UnexpectedValueException(sprintf(
"Expecting exactly one argument that is the document/literal wrapper, got %d",
count($args)
));
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php
index 61918e47d1930271a40109b61b669715f658513c..cab0c17ba7bd13e5db0d4d8dbb2f1deebd28580e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php
@@ -11,54 +11,55 @@ namespace Zend\Soap;
use DOMNode;
use DOMDocument;
+use DOMDocumentFragment;
use DOMElement;
+use DOMXPath;
+use Zend\Soap\Exception\InvalidArgumentException;
use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
use Zend\Uri\Uri;
-/**
- * \Zend\Soap\Wsdl
- */
class Wsdl
{
/**#@+
- * XML Namespaces.
- */
- const XML_NS = 'xmlns';
- const XML_NS_URI = 'http://www.w3.org/2000/xmlns/';
- const WSDL_NS = 'wsdl';
- const WSDL_NS_URI = 'http://schemas.xmlsoap.org/wsdl/';
- const SOAP_11_NS = 'soap';
- const SOAP_11_NS_URI = 'http://schemas.xmlsoap.org/wsdl/soap/';
- const SOAP_12_NS = 'soap12';
- const SOAP_12_NS_URI = 'http://schemas.xmlsoap.org/wsdl/soap12/';
- const SOAP_ENC_NS = 'soap-enc';
- const SOAP_ENC_URI = 'http://schemas.xmlsoap.org/soap/encoding/';
- const XSD_NS = 'xsd';
- const XSD_NS_URI = 'http://www.w3.org/2001/XMLSchema';
- const TYPES_NS = 'tns';
+ * XML Namespace uris and prefixes.
+ */
+ const XML_NS = 'xmlns';
+ const XML_NS_URI = 'http://www.w3.org/2000/xmlns/';
+ const WSDL_NS = 'wsdl';
+ const WSDL_NS_URI = 'http://schemas.xmlsoap.org/wsdl/';
+ const SOAP_11_NS = 'soap';
+ const SOAP_11_NS_URI = 'http://schemas.xmlsoap.org/wsdl/soap/';
+ const SOAP_12_NS = 'soap12';
+ const SOAP_12_NS_URI = 'http://schemas.xmlsoap.org/wsdl/soap12/';
+ const SOAP_ENC_NS = 'soap-enc';
+ const SOAP_ENC_URI = 'http://schemas.xmlsoap.org/soap/encoding/';
+ const XSD_NS = 'xsd';
+ const XSD_NS_URI = 'http://www.w3.org/2001/XMLSchema';
+ const TYPES_NS = 'tns';
/**#@-*/
/**
- * @var DOMDocument DOM document Instance
+ * Map of PHP Class names to WSDL QNames.
+ * @var array
*/
- private $dom;
+ protected $classMap = array();
/**
- * @var object WSDL Root XML_Tree_Node
+ * DOM Instance
+ * @var DOMDocument
*/
- private $wsdl;
+ protected $dom;
/**
- * @var DOMElement
+ * Types defined on schema
+ * @var array
*/
- private $schema = null;
+ protected $includedTypes = array();
/**
- * Types defined on schema
- *
- * @var array
+ * @var DOMElement
*/
- private $includedTypes = array();
+ protected $schema = null;
/**
* Strategy for detection of complex types
@@ -66,71 +67,76 @@ class Wsdl
protected $strategy = null;
/**
- * Map of PHP Class names to WSDL QNames.
- *
- * @var array
+ * URI where the WSDL will be available
+ * @var string
*/
- protected $classMap = array();
+ protected $uri;
/**
- * Constructor
- *
- * @param string $name Name of the Web Service being Described
- * @param string|Uri $uri URI where the WSDL will be available
- * @param null|ComplexTypeStrategy $strategy Strategy for detection of complex types
- * @param null|array $classMap Map of PHP Class names to WSDL QNames
+ * Root XML_Tree_Node
+ * @var DOMElement WSDL
+ */
+ protected $wsdl;
+
+ /**
+ * @param string $name Name of the Web Service being Described
+ * @param string|Uri $uri URI where the WSDL will be available
+ * @param null|ComplexTypeStrategy $strategy Strategy for detection of complex types
+ * @param null|array $classMap Map of PHP Class names to WSDL QNames
* @throws Exception\RuntimeException
*/
- public function __construct($name, $uri, ComplexTypeStrategy $strategy = null, array $classMap = array())
- {
+ public function __construct(
+ $name,
+ $uri,
+ ComplexTypeStrategy $strategy = null,
+ array $classMap = array()
+ ) {
if ($uri instanceof Uri) {
$uri = $uri->toString();
}
- $this->classMap = $classMap;
- $this->dom = new DOMDocument('1.0', 'utf-8');
- $targetNamespace = $this->escapeUri($uri);
- $definitions = $this->dom->createElement('definitions');
- $definitions->setAttributeNS(self::XML_NS_URI, self::XML_NS, self::WSDL_NS_URI);
- $definitions->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::TYPES_NS, $targetNamespace);
- $definitions->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::SOAP_11_NS, self::SOAP_11_NS_URI);
- $definitions->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::SOAP_12_NS, self::SOAP_12_NS_URI);
- $definitions->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::XSD_NS, self::XSD_NS_URI);
- $definitions->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::SOAP_ENC_NS, self::SOAP_ENC_URI);
- $definitions->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::WSDL_NS, self::WSDL_NS_URI);
- $definitions->setAttribute('name', $name);
- $definitions->setAttribute('targetNamespace', $targetNamespace);
- $this->dom->appendChild($definitions);
- $this->wsdl = $this->dom->documentElement;
- $this->setComplexTypeStrategy($strategy ?: new Wsdl\ComplexTypeStrategy\DefaultComplexType);
- }
- /**
- * URL encode query part of the URI if it is present.
- *
- * @param string $uri
- * @return string
- */
- protected function escapeUri($uri)
- {
- // normalize URL
- $uri = urldecode($uri);
- if (preg_match('/\?(.+)$/', $uri, $matches)) {
- $query = $matches[1];
- $uri = str_replace($query, urlencode($query), $uri);
- }
+ $this->setUri($uri);
- return $uri;
+ $this->classMap = $classMap;
+ $this->dom = $this->getDOMDocument($name, $this->getUri());
+ $this->wsdl = $this->dom->documentElement;
+
+ $this->setComplexTypeStrategy($strategy ?: new Wsdl\ComplexTypeStrategy\DefaultComplexType);
}
/**
- * Convert encoded ampersand back to decoded value, to avoid double encoding by DOMElement::setAttribute()
+ * Get the wsdl XML document with all namespaces and required attributes
*
- * @param $uri
- * @return mixed
+ * @param string $uri
+ * @param string $name
+ * @return DOMDocument
*/
- protected function decodeAmpersand($uri)
+ protected function getDOMDocument($name, $uri = null)
{
- return str_replace('&', '&', $uri);
+ $dom = new DOMDocument();
+
+ // @todo new option for debug mode ?
+ $dom->preserveWhiteSpace = false;
+ $dom->formatOutput = false;
+ $dom->resolveExternals = false;
+ $dom->encoding = 'UTF-8';
+ $dom->substituteEntities = false;
+
+ $definitions = $dom->createElementNS(self::WSDL_NS_URI, 'definitions');
+ $dom->appendChild($definitions);
+
+ $uri = $this->sanitizeUri($uri);
+ $this->setAttributeWithSanitization($definitions, 'name', $name);
+ $this->setAttributeWithSanitization($definitions, 'targetNamespace', $uri);
+
+ $definitions->setAttributeNS(self::XML_NS_URI, 'xmlns:'. self::WSDL_NS, self::WSDL_NS_URI);
+ $definitions->setAttributeNS(self::XML_NS_URI, 'xmlns:'. self::TYPES_NS, $uri);
+ $definitions->setAttributeNS(self::XML_NS_URI, 'xmlns:'. self::SOAP_11_NS, self::SOAP_11_NS_URI);
+ $definitions->setAttributeNS(self::XML_NS_URI, 'xmlns:'. self::XSD_NS, self::XSD_NS_URI);
+ $definitions->setAttributeNS(self::XML_NS_URI, 'xmlns:'. self::SOAP_ENC_NS, self::SOAP_ENC_URI);
+ $definitions->setAttributeNS(self::XML_NS_URI, 'xmlns:'. self::SOAP_12_NS, self::SOAP_12_NS_URI);
+
+ return $dom;
}
/**
@@ -148,7 +154,7 @@ class Wsdl
}
/**
- * Get the class map of php to wsdl qname types.
+ * Get the class map of php to wsdl mappings..
*
* @return array
*/
@@ -158,42 +164,101 @@ class Wsdl
}
/**
- * Set the class map of php to wsdl qname types.
+ * Set the class map of php to wsdl mappings..
+ *
+ * @return self
*/
public function setClassMap($classMap)
{
$this->classMap = $classMap;
+ return $this;
}
/**
* Set a new uri for this WSDL
*
* @param string|Uri $uri
- * @return \Zend\Soap\Wsdl
+ * @return self
*/
public function setUri($uri)
{
- if ($uri instanceof Uri) {
+ if ($uri instanceof Uri){
$uri = $uri->toString();
}
- if ($this->wsdl !== null) {
- $targetNamespace = $this->escapeUri($uri);
- $this->wsdl->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::TYPES_NS, $targetNamespace);
- $this->wsdl->setAttribute('targetNamespace', $targetNamespace);
- if ($this->schema !== null) {
- $this->schema->setAttribute('targetNamespace', $targetNamespace);
+ $uri = $this->sanitizeUri($uri);
+
+ $oldUri = $this->uri;
+ $this->uri = $uri;
+
+ if ($this->dom instanceof DOMDocument ) {
+ // namespace declarations are NOT true attributes so one must explicitly set on root element
+ // xmlns:tns = $uri
+ $this->dom->documentElement->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::TYPES_NS, $uri);
+
+ $xpath = new DOMXPath($this->dom);
+ $xpath->registerNamespace('default', self::WSDL_NS_URI);
+
+ $xpath->registerNamespace(self::TYPES_NS, $uri);
+ $xpath->registerNamespace(self::SOAP_11_NS, self::SOAP_11_NS_URI);
+ $xpath->registerNamespace(self::SOAP_12_NS, self::SOAP_12_NS_URI);
+ $xpath->registerNamespace(self::XSD_NS, self::XSD_NS_URI);
+ $xpath->registerNamespace(self::SOAP_ENC_NS, self::SOAP_ENC_URI);
+ $xpath->registerNamespace(self::WSDL_NS, self::WSDL_NS_URI);
+
+ // Select only attribute nodes. Data nodes does not contain uri
+ // except for documentation node but this is for the user to decide.
+ // This list does not include xmlns:tsn attribute of document root.
+ // That attribute is changed above.
+ $attributeNodes = $xpath->query('//attribute::*[contains(., "' . $oldUri . '")]');
+
+ foreach ($attributeNodes as $node) {
+ $attributeValue = $this->dom->createTextNode(str_replace($oldUri, $uri, $node->nodeValue));
+ $node->replaceChild($attributeValue, $node->childNodes->item(0));
}
}
return $this;
}
+ /**
+ * Return WSDL uri
+ *
+ * @return string
+ */
+ public function getUri()
+ {
+ return $this->uri;
+ }
+
+ /**
+ * Function for sanitizing uri
+ *
+ * @param string|Uri $uri
+ * @return string
+ * @throws Exception\InvalidArgumentException
+ */
+ public function sanitizeUri($uri)
+ {
+ if ($uri instanceof Uri) {
+ $uri = $uri->toString();
+ }
+
+ $uri = trim($uri);
+ $uri = htmlspecialchars($uri, ENT_QUOTES, 'UTF-8', false);
+
+ if (empty($uri)) {
+ throw new Exception\InvalidArgumentException('Uri contains invalid characters or is empty');
+ }
+
+ return $uri;
+ }
+
/**
* Set a strategy for complex type detection and handling
*
- * @param ComplexTypeStrategy $strategy
- * @return \Zend\Soap\Wsdl
+ * @param ComplexTypeStrategy $strategy
+ * @return self
*/
public function setComplexTypeStrategy(ComplexTypeStrategy $strategy)
{
@@ -214,165 +279,157 @@ class Wsdl
/**
* Add a {@link http://www.w3.org/TR/wsdl#_messages message} element to the WSDL
*
- * @param string $name Name for the {@link http://www.w3.org/TR/wsdl#_messages message}
- * @param array $parts An array of {@link http://www.w3.org/TR/wsdl#_message parts}
- * The array is constructed like: 'name of part' => 'part xml schema data type'
- * or 'name of part' => array('type' => 'part xml schema type')
- * or 'name of part' => array('element' => 'part xml element name')
+ * @param string $messageName Name for the {@link http://www.w3.org/TR/wsdl#_messages message}
+ * @param array $parts An array of {@link http://www.w3.org/TR/wsdl#_message parts}
+ * The array is constructed like:
+ * 'name of part' => 'part xml schema data type' or
+ * 'name of part' => array('type' => 'part xml schema type') or
+ * 'name of part' => array('element' => 'part xml element name')
* @return DOMElement The new message's XML_Tree_Node for use in {@link function addDocumentation}
*/
- public function addMessage($name, $parts)
+ public function addMessage($messageName, $parts)
{
- $message = $this->dom->createElement('message');
-
- $message->setAttribute('name', $name);
+ $message = $this->dom->createElementNS(self::WSDL_NS_URI, 'message');
+ $message->setAttribute('name', $messageName);
if (count($parts) > 0) {
foreach ($parts as $name => $type) {
- $part = $this->dom->createElement('part');
+ $part = $this->dom->createElementNS(self::WSDL_NS_URI, 'part');
+ $message->appendChild($part);
+
$part->setAttribute('name', $name);
if (is_array($type)) {
- foreach ($type as $key => $value) {
- $part->setAttribute($key, $value);
- }
+ $this->arrayToAttributes($part, $type);
} else {
- $part->setAttribute('type', $type);
+ $this->setAttributeWithSanitization($part, 'type', $type);
}
- $message->appendChild($part);
}
}
$this->wsdl->appendChild($message);
-
return $message;
}
/**
* Add a {@link http://www.w3.org/TR/wsdl#_porttypes portType} element to the WSDL
*
- * @param string $name portType element's name
- * @return DOMElement The new portType's XML_Tree_Node for use in {@link function addPortOperation} and {@link function addDocumentation}
+ * @param string $name portType element's name
+ * @return DOMElement The new portType's XML_Tree_Node for use in {@link function addPortOperation} and <a href='psi_element://function'>addDocumentation</a>@link function addDocumentation}
*/
public function addPortType($name)
{
- $portType = $this->dom->createElement('portType');
- $portType->setAttribute('name', $name);
+ $portType = $this->dom->createElementNS(self::WSDL_NS_URI, 'portType');
$this->wsdl->appendChild($portType);
-
+ $portType->setAttribute('name', $name);
return $portType;
}
/**
* Add an {@link http://www.w3.org/TR/wsdl#request-response operation} element to a portType element
*
- * @param DOMElement $portType a portType XML_Tree_Node, from {@link function addPortType}
- * @param string $name Operation name
- * @param bool|string $input Input Message
- * @param bool|string $output Output Message
- * @param bool|string $fault Fault Message
+ * @param DOMElement $portType a portType XML_Tree_Node, from {@link function addPortType}
+ * @param string $name Operation name
+ * @param bool|string $input Input Message
+ * @param bool|string $output Output Message
+ * @param bool|string $fault Fault Message
* @return DOMElement The new operation's XML_Tree_Node for use in {@link function addDocumentation}
*/
public function addPortOperation($portType, $name, $input = false, $output = false, $fault = false)
{
- $operation = $this->dom->createElement('operation');
+ $operation = $this->dom->createElementNS(self::WSDL_NS_URI, 'operation');
+ $portType->appendChild($operation);
+
$operation->setAttribute('name', $name);
if (is_string($input) && (strlen(trim($input)) >= 1)) {
- $node = $this->dom->createElement('input');
- $node->setAttribute('message', $input);
+ $node = $this->dom->createElementNS(self::WSDL_NS_URI, 'input');
$operation->appendChild($node);
+ $node->setAttribute('message', $input);
}
+
if (is_string($output) && (strlen(trim($output)) >= 1)) {
- $node= $this->dom->createElement('output');
- $node->setAttribute('message', $output);
+ $node= $this->dom->createElementNS(self::WSDL_NS_URI, 'output');
$operation->appendChild($node);
+ $node->setAttribute('message', $output);
}
+
if (is_string($fault) && (strlen(trim($fault)) >= 1)) {
- $node = $this->dom->createElement('fault');
- $node->setAttribute('message', $fault);
+ $node = $this->dom->createElementNS(self::WSDL_NS_URI, 'fault');
$operation->appendChild($node);
+ $node->setAttribute('message', $fault);
}
- $portType->appendChild($operation);
-
return $operation;
}
/**
* Add a {@link http://www.w3.org/TR/wsdl#_bindings binding} element to WSDL
*
- * @param string $name Name of the Binding
- * @param string $portType name of the portType to bind
+ * @param string $name Name of the Binding
+ * @param string $portType name of the portType to bind
* @return DOMElement The new binding's XML_Tree_Node for use with {@link function addBindingOperation} and {@link function addDocumentation}
*/
public function addBinding($name, $portType)
{
- $binding = $this->dom->createElement('binding');
- $binding->setAttribute('name', $name);
- $binding->setAttribute('type', $portType);
-
+ $binding = $this->dom->createElementNS(self::WSDL_NS_URI, 'binding');
$this->wsdl->appendChild($binding);
+ $this->setAttribute($binding, 'name', $name);
+ $this->setAttribute($binding, 'type', $portType);
+
return $binding;
}
/**
* Add an operation to a binding element
*
- * @param DOMElement $binding A binding XML_Tree_Node returned by {@link function addBinding}
- * @param string $name
- * @param bool|array $input An array of attributes for the input element, allowed keys are: 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
- * @param bool|array $output An array of attributes for the output element, allowed keys are: 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
- * @param bool|array $fault An array of attributes for the fault element, allowed keys are: 'name', 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
- * @param int $soapVersion SOAP version to be used in binding operation. 1.1 used by default.
+ * @param DOMElement $binding A binding XML_Tree_Node returned by {@link function addBinding}
+ * @param string $name
+ * @param array|bool $input An array of attributes for the input element,
+ * allowed keys are: 'use', 'namespace', 'encodingStyle'.
+ * {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
+ * @param array|bool $output An array of attributes for the output element,
+ * allowed keys are: 'use', 'namespace', 'encodingStyle'.
+ * {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
+ * @param array|bool $fault An array with attributes for the fault element,
+ * allowed keys are: 'name', 'use', 'namespace', 'encodingStyle'.
+ * {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
+ * @param int $soapVersion SOAP version: SOAP_1_1 or SOAP_1_2, default: SOAP_1_1
* @return DOMElement The new Operation's XML_Tree_Node for use with {@link function addSoapOperation} and {@link function addDocumentation}
*/
- public function addBindingOperation(
- $binding,
- $name,
- $input = false,
- $output = false,
- $fault = false,
- $soapVersion = SOAP_1_1
- ) {
- $operation = $this->dom->createElement('operation');
- $operation->setAttribute('name', $name);
+ public function addBindingOperation($binding, $name, $input = false, $output = false, $fault = false, $soapVersion = SOAP_1_1)
+ {
+ $operation = $this->dom->createElementNS(self::WSDL_NS_URI, 'operation');
+ $binding->appendChild($operation);
- $soapNs = $soapVersion == SOAP_1_1 ? self::SOAP_11_NS : self::SOAP_12_NS;
- if (is_array($input)) {
- $node = $this->dom->createElement('input');
- $soapNode = $this->dom->createElement($soapNs . ':body');
- foreach ($input as $name => $value) {
- $soapNode->setAttribute($name, $this->decodeAmpersand($value));
- }
- $node->appendChild($soapNode);
+ $this->setAttribute($operation, 'name', $name);
+
+ if (is_array($input) && !empty($input)) {
+ $node = $this->dom->createElementNS(self::WSDL_NS_URI, 'input');
$operation->appendChild($node);
- }
- if (is_array($output)) {
- $node = $this->dom->createElement('output');
- $soapNode = $this->dom->createElement($soapNs . ':body');
- foreach ($output as $name => $value) {
- $soapNode->setAttribute($name, $this->decodeAmpersand($value));
- }
+ $soapNode = $this->dom->createElementNS($this->getSoapNamespaceUriByVersion($soapVersion), 'body');
$node->appendChild($soapNode);
- $operation->appendChild($node);
+
+ $this->arrayToAttributes($soapNode, $input);
}
- if (is_array($fault)) {
- $node = $this->dom->createElement('fault');
- if (isset($fault['name'])) {
- $node->setAttribute('name', $fault['name']);
- }
- $soapNode = $this->dom->createElement($soapNs . ':fault');
- foreach ($fault as $name => $value) {
- $soapNode->setAttribute($name, $this->decodeAmpersand($value));
- }
- $node->appendChild($soapNode);
+ if (is_array($output) && !empty($output)) {
+ $node = $this->dom->createElementNS(self::WSDL_NS_URI, 'output');
$operation->appendChild($node);
+
+ $soapNode = $this->dom->createElementNS($this->getSoapNamespaceUriByVersion($soapVersion), 'body');
+ $node->appendChild($soapNode);
+
+ $this->arrayToAttributes($soapNode, $output);
}
- $binding->appendChild($operation);
+ if (is_array($fault) && !empty($fault)) {
+ $node = $this->dom->createElementNS(self::WSDL_NS_URI, 'fault');
+ $operation->appendChild($node);
+
+ $this->arrayToAttributes($node, $fault);
+ }
return $operation;
}
@@ -380,34 +437,29 @@ class Wsdl
/**
* Add a {@link http://www.w3.org/TR/wsdl#_soap:binding SOAP binding} element to a Binding element
*
- * @param DOMElement $binding A binding XML_Tree_Node returned by {@link function addBinding}
- * @param string $style binding style, possible values are "rpc" (the default) and "document"
- * @param string $transport Transport method (defaults to HTTP)
- * @param int $soapVersion SOAP version to be used in binding. 1.1 used by default.
+ * @param DOMElement $binding A binding XML_Tree_Node returned by {@link function addBinding}
+ * @param string $style binding style, possible values are "rpc" (the default) and "document"
+ * @param string $transport Transport method (defaults to HTTP)
+ * @param int $soapVersion SOAP version: SOAP_1_1 or SOAP_1_2, default: SOAP_1_1
* @return DOMElement
*/
- public function addSoapBinding(
- $binding,
- $style = 'document',
- $transport = 'http://schemas.xmlsoap.org/soap/http',
- $soapVersion = SOAP_1_1
- ) {
- $soapNs = $soapVersion == SOAP_1_1 ? self::SOAP_11_NS : self::SOAP_12_NS;
- $soapBinding = $this->dom->createElement($soapNs . ':binding');
+ public function addSoapBinding($binding, $style = 'document', $transport = 'http://schemas.xmlsoap.org/soap/http', $soapVersion = SOAP_1_1)
+ {
+ $soapBinding = $this->dom->createElementNS($this->getSoapNamespaceUriByVersion($soapVersion), 'binding');
+ $binding->appendChild($soapBinding);
+
$soapBinding->setAttribute('style', $style);
$soapBinding->setAttribute('transport', $transport);
- $binding->appendChild($soapBinding);
-
return $soapBinding;
}
/**
* Add a {@link http://www.w3.org/TR/wsdl#_soap:operation SOAP operation} to an operation element
*
- * @param DOMElement $operation An operation XML_Tree_Node returned by {@link function addBindingOperation}
- * @param string $soapAction SOAP Action
- * @param int $soapVersion SOAP version to be used in operation. 1.1 used by default.
+ * @param DOMElement $operation An operation XML_Tree_Node returned by {@link function addBindingOperation}
+ * @param string $soapAction SOAP Action
+ * @param int $soapVersion SOAP version: SOAP_1_1 or SOAP_1_2, default: SOAP_1_1
* @return DOMElement
*/
public function addSoapOperation($operation, $soapAction, $soapVersion = SOAP_1_1)
@@ -415,23 +467,22 @@ class Wsdl
if ($soapAction instanceof Uri) {
$soapAction = $soapAction->toString();
}
- $soapNs = $soapVersion == SOAP_1_1 ? self::SOAP_11_NS : self::SOAP_12_NS;
- $soapOperation = $this->dom->createElement($soapNs . ':operation');
- $soapOperation->setAttribute('soapAction', $this->decodeAmpersand($soapAction));
-
+ $soapOperation = $this->dom->createElementNS($this->getSoapNamespaceUriByVersion($soapVersion), 'operation');
$operation->insertBefore($soapOperation, $operation->firstChild);
+ $this->setAttributeWithSanitization($soapOperation, 'soapAction', $soapAction);
+
return $soapOperation;
}
/**
* Add a {@link http://www.w3.org/TR/wsdl#_services service} element to the WSDL
*
- * @param string $name Service Name
- * @param string $portName Name of the port for the service
- * @param string $binding Binding for the port
- * @param string $location SOAP Address for the service
- * @param int $soapVersion SOAP version to be used in service. 1.1 used by default.
+ * @param string $name Service Name
+ * @param string $portName Name of the port for the service
+ * @param string $binding Binding for the port
+ * @param string $location SOAP Address for the service
+ * @param int $soapVersion SOAP version: SOAP_1_1 or SOAP_1_2, default: SOAP_1_1
* @return DOMElement The new service's XML_Tree_Node for use with {@link function addDocumentation}
*/
public function addService($name, $portName, $binding, $location, $soapVersion = SOAP_1_1)
@@ -439,22 +490,22 @@ class Wsdl
if ($location instanceof Uri) {
$location = $location->toString();
}
- $service = $this->dom->createElement('service');
+ $service = $this->dom->createElementNS(WSDL::WSDL_NS_URI, 'service');
+ $this->wsdl->appendChild($service);
+
$service->setAttribute('name', $name);
- $port = $this->dom->createElement('port');
+
+ $port = $this->dom->createElementNS(WSDL::WSDL_NS_URI, 'port');
+ $service->appendChild($port);
+
$port->setAttribute('name', $portName);
$port->setAttribute('binding', $binding);
- $soapNs = $soapVersion == SOAP_1_1 ? self::SOAP_11_NS : self::SOAP_12_NS;
- $soapAddress = $this->dom->createElement($soapNs . ':address');
- $soapAddress->setAttribute('location', $this->decodeAmpersand($location));
-
+ $soapAddress = $this->dom->createElementNS($this->getSoapNamespaceUriByVersion($soapVersion), 'address');
$port->appendChild($soapAddress);
- $service->appendChild($port);
-
- $this->wsdl->appendChild($service);
+ $this->setAttributeWithSanitization($soapAddress, 'location', $location);
return $service;
}
@@ -465,8 +516,8 @@ class Wsdl
* but the WSDL {@link http://schemas.xmlsoap.org/wsdl/ schema} uses 'documentation' instead.
* The {@link http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html#WSDL_documentation_Element WS-I Basic Profile 1.1} recommends using 'documentation'.
*
- * @param DOMElement $inputNode An XML_Tree_Node returned by another method to add the documentation to
- * @param string $documentation Human readable documentation for the node
+ * @param DOMElement $inputNode An XML_Tree_Node returned by another method to add the documentation to
+ * @param string $documentation Human readable documentation for the node
* @return DOMElement The documentation element
*/
public function addDocumentation($inputNode, $documentation)
@@ -477,30 +528,29 @@ class Wsdl
$node = $inputNode;
}
- $doc = $this->dom->createElement('documentation');
- $docCData = $this->dom->createTextNode(str_replace(array("\r\n", "\r"), "\n", $documentation));
- $doc->appendChild($docCData);
-
+ $doc = $this->dom->createElementNS(WSDL::WSDL_NS_URI, 'documentation');
if ($node->hasChildNodes()) {
$node->insertBefore($doc, $node->firstChild);
} else {
$node->appendChild($doc);
}
+ $docCData = $this->dom->createTextNode(str_replace(array("\r\n", "\r"), "\n", $documentation));
+ $doc->appendChild($docCData);
return $doc;
}
/**
* Add WSDL Types element
*
- * @param DOMNode $types A DOM Node with all the XML Schema types defined in it
+ * @param DOMDocument|DOMNode|DOMElement|DOMDocumentFragment $types A DOMDocument|DOMNode|DOMElement|DOMDocumentFragment with all the XML Schema types defined in it
*/
public function addTypes(DOMNode $types)
{
if ($types instanceof DOMDocument) {
- $this->dom->importNode($types->documentElement);
- $this->wsdl->appendChild($types->documentElement);
- } else {
+ $dom = $this->dom->importNode($types->documentElement);
+ $this->wsdl->appendChild($dom);
+ } elseif ($types instanceof DOMNode || $types instanceof DOMElement || $types instanceof DOMDocumentFragment ) {
$dom = $this->dom->importNode($types);
$this->wsdl->appendChild($dom);
}
@@ -509,9 +559,9 @@ class Wsdl
/**
* Add a complex type name that is part of this WSDL and can be used in signatures.
*
- * @param string $type
- * @param string $wsdlType
- * @return \Zend\Soap\Wsdl
+ * @param string $type
+ * @param string $wsdlType
+ * @return self
*/
public function addType($type, $wsdlType)
{
@@ -541,7 +591,6 @@ class Wsdl
if ($this->schema == null) {
$this->addSchemaTypeSection();
}
-
return $this->schema;
}
@@ -552,6 +601,7 @@ class Wsdl
*/
public function toXML()
{
+ $this->dom->normalizeDocument();
return $this->dom->saveXML();
}
@@ -562,28 +612,32 @@ class Wsdl
*/
public function toDomDocument()
{
+ $this->dom->normalizeDocument();
return $this->dom;
}
/**
- * Echo the WSDL as XML to stdout or save the WSDL to a file
+ * Echo the WSDL as XML
*
- * @param bool|string $filename Filename to save the output (Optional)
+ * @param bool $filename
* @return bool
*/
public function dump($filename = false)
{
+ $this->dom->normalizeDocument();
+
if (!$filename) {
echo $this->toXML();
return true;
}
+
return (bool) file_put_contents($filename, $this->toXML());
}
/**
* Returns an XSD Type for the given PHP type
*
- * @param string $type PHP Type to get the XSD type for
+ * @param string $type PHP Type to get the XSD type for
* @return string
*/
public function getType($type)
@@ -591,54 +645,67 @@ class Wsdl
switch (strtolower($type)) {
case 'string':
case 'str':
- return 'xsd:string';
+ return self::XSD_NS . ':string';
+
case 'long':
- return 'xsd:long';
+ return self::XSD_NS . ':long';
+
case 'int':
case 'integer':
- return 'xsd:int';
+ return self::XSD_NS . ':int';
+
case 'float':
- return 'xsd:float';
+ return self::XSD_NS . ':float';
+
case 'double':
- return 'xsd:double';
+ return self::XSD_NS . ':double';
+
case 'boolean':
case 'bool':
- return 'xsd:boolean';
+ return self::XSD_NS . ':boolean';
+
case 'array':
- return 'soap-enc:Array';
+ return self::SOAP_ENC_NS . ':Array';
+
case 'object':
- return 'xsd:struct';
+ return self::XSD_NS . ':struct';
+
case 'mixed':
- return 'xsd:anyType';
+ return self::XSD_NS . ':anyType';
+
case 'void':
return '';
+
default:
// delegate retrieval of complex type to current strategy
return $this->addComplexType($type);
- }
+ }
}
/**
* This function makes sure a complex types section and schema additions are set.
*
- * @return \Zend\Soap\Wsdl
+ * @return self
*/
public function addSchemaTypeSection()
{
if ($this->schema === null) {
- $this->schema = $this->dom->createElement(self::XSD_NS . ':schema');
- $this->schema->setAttribute('targetNamespace', $this->getTargetNamespace());
- $types = $this->dom->createElement('types');
- $types->appendChild($this->schema);
+ $types = $this->dom->createElementNS(self::WSDL_NS_URI, 'types');
$this->wsdl->appendChild($types);
+
+ $this->schema = $this->dom->createElementNS(WSDL::XSD_NS_URI, 'schema');
+ $types->appendChild($this->schema);
+
+ $this->setAttributeWithSanitization($this->schema, 'targetNamespace', $this->getUri());
}
+
return $this;
}
/**
* Translate PHP type into WSDL QName
*
- * @param string $type
+ * @param string $type
* @return string QName
*/
public function translateType($type)
@@ -647,22 +714,21 @@ class Wsdl
return $this->classMap[$type];
}
- if ($type[0] == '\\') {
- $type = substr($type, 1);
- }
+ $type = trim($type,'\\');
+ // remove namespace,
$pos = strrpos($type, '\\');
if ($pos) {
$type = substr($type, $pos+1);
}
- return str_replace('\\', '.', $type);
+ return $type;
}
/**
* Add a {@link http://www.w3.org/TR/wsdl#_types types} data type definition
*
- * @param string $type Name of the class to be specified
+ * @param string $type Name of the class to be specified
* @return string XSD Type for the given PHP type
*/
public function addComplexType($type)
@@ -674,6 +740,7 @@ class Wsdl
$strategy = $this->getComplexTypeStrategy();
$strategy->setContext($this);
+
// delegates the detection of a complex type to the current strategy
return $strategy->addComplexType($type);
}
@@ -681,36 +748,127 @@ class Wsdl
/**
* Parse an xsd:element represented as an array into a DOMElement.
*
- * @param array $element an xsd:element represented as an array
- * @throws Exception\RuntimeException if $element is not an array
+ * @param array $element an xsd:element represented as an array
* @return DOMElement parsed element
+ * @throws Exception\RuntimeException if $element is not an array
*/
- private function _parseElement($element)
+ protected function _parseElement($element)
{
if (!is_array($element)) {
throw new Exception\RuntimeException('The "element" parameter needs to be an associative array.');
}
- $elementXml = $this->dom->createElement(self::XSD_NS . ':element');
+ $elementXML = $this->dom->createElementNS(self::XSD_NS_URI, 'element');
foreach ($element as $key => $value) {
if (in_array($key, array('sequence', 'all', 'choice'))) {
if (is_array($value)) {
- $complexType = $this->dom->createElement(self::XSD_NS . ':complexType');
+ $complexType = $this->dom->createElementNS(self::XSD_NS_URI, 'complexType');
if (count($value) > 0) {
- $container = $this->dom->createElement(self::XSD_NS . ':' . $key);
- foreach ($value as $subelement) {
- $subelementXml = $this->_parseElement($subelement);
- $container->appendChild($subelementXml);
+ $container = $this->dom->createElementNS(self::XSD_NS_URI, $key);
+ foreach ($value as $subElement) {
+ $subElementXML = $this->_parseElement($subElement);
+ $container->appendChild($subElementXML);
}
$complexType->appendChild($container);
}
- $elementXml->appendChild($complexType);
+ $elementXML->appendChild($complexType);
}
} else {
- $elementXml->setAttribute($key, $value);
+ $elementXML->setAttribute($key, $value);
+ }
+ }
+
+ return $elementXML;
+ }
+
+ /**
+ * Prepare attribute value for specific attributes
+ *
+ * @param string $name
+ * @param mixed $value
+ * @return string safe value or original $value
+ */
+ protected function sanitizeAttributeValueByName($name, $value)
+ {
+ switch (strtolower($name)) {
+ case 'targetnamespace':
+ case 'encodingstyle':
+ case 'soapaction':
+ case 'location':
+ return $this->sanitizeUri($value);
+ break;
+
+ default:
+ return $value;
+ break;
+ }
+ }
+
+ /**
+ * Convert associative array to attributes of given node using optional {@link function sanitizeAttributeValueByName}
+ *
+ * @param DOMNode $node
+ * @param array $attributes
+ * @param bool $withSanitizer
+ */
+ protected function arrayToAttributes(\DOMNode $node, array $attributes, $withSanitizer = true)
+ {
+ foreach($attributes as $attributeName => $attributeValue) {
+ if ($withSanitizer) {
+ $this->setAttributeWithSanitization($node, $attributeName, $attributeValue);
+ } else {
+ $this->setAttribute($node, $attributeName, $attributeValue);
}
}
- return $elementXml;
+ }
+
+ /**
+ * Set attribute to given node using {@link function sanitizeAttributeValueByName}
+ *
+ * @param DOMNode $node
+ * @param string $attributeName
+ * @param mixed $attributeValue
+ */
+ protected function setAttributeWithSanitization(\DOMNode $node, $attributeName, $attributeValue)
+ {
+ $attributeValue = $this->sanitizeAttributeValueByName($attributeName, $attributeValue);
+ $this->setAttribute($node, $attributeName, $attributeValue);
+ }
+
+ /**
+ * Set attribute to given node
+ *
+ * @param DOMNode $node
+ * @param string $attributeName
+ * @param mixed $attributeValue
+ */
+ protected function setAttribute(\DOMNode $node, $attributeName, $attributeValue)
+ {
+ $attributeNode = $node->ownerDocument->createAttribute($attributeName);
+ $node->appendChild($attributeNode);
+
+ $attributeNodeValue = $node->ownerDocument->createTextNode($attributeValue);
+ $attributeNode->appendChild($attributeNodeValue);
+ }
+
+ /**
+ * Return soap namespace uri according to $soapVersion
+ *
+ * @param int $soapVersion SOAP_1_1 or SOAP_1_2 constants
+ * @return string
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function getSoapNamespaceUriByVersion($soapVersion)
+ {
+ if ($soapVersion != SOAP_1_1 AND $soapVersion != SOAP_1_2) {
+ throw new Exception\InvalidArgumentException('Invalid SOAP version, use constants: SOAP_1_1 or SOAP_1_2');
+ }
+
+ if ($soapVersion == SOAP_1_1) {
+ return self::SOAP_11_NS_URI;
+ }
+
+ return self::SOAP_12_NS_URI;
}
/**
@@ -728,7 +886,7 @@ class Wsdl
* <xsd:element name="myInteger" type="int"/>
* </xsd:sequence></xsd:complexType></xsd:element>
*
- * @param array $element an xsd:element represented as an array
+ * @param array $element an xsd:element represented as an array
* @return string xsd:element for the given element array
*/
public function addElement($element)
@@ -736,6 +894,7 @@ class Wsdl
$schema = $this->getSchema();
$elementXml = $this->_parseElement($element);
$schema->appendChild($elementXml);
+
return self::TYPES_NS . ':' . $element['name'];
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
index 1b626f0195d4964012410ec93ecde2727beee98f..36bc8bfc34eb3a29e229614684a930e1eb33a4b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
@@ -9,33 +9,33 @@
namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
+use Zend\Soap\Wsdl;
+
/**
- * Abstract class for Zend_Soap_Wsdl_Strategy.
+ * Abstract class for Zend\Soap\Wsdl\Strategy.
*/
abstract class AbstractComplexTypeStrategy implements ComplexTypeStrategyInterface
{
/**
* Context object
- *
- * @var \Zend\Soap\Wsdl
+ * @var Wsdl
*/
protected $context;
/**
- * Set the Zend_Soap_Wsdl Context object this strategy resides in.
+ * Set the WSDL Context object this strategy resides in.
*
- * @param \Zend\Soap\Wsdl $context
- * @return void
+ * @param Wsdl $context
*/
- public function setContext(\Zend\Soap\Wsdl $context)
+ public function setContext(Wsdl $context)
{
$this->context = $context;
}
/**
- * Return the current Zend_Soap_Wsdl context object
+ * Return the current WSDL context object
*
- * @return \Zend\Soap\Wsdl
+ * @return Wsdl
*/
public function getContext()
{
@@ -45,16 +45,16 @@ abstract class AbstractComplexTypeStrategy implements ComplexTypeStrategyInterfa
/**
* Look through registered types
*
- * @param string $phpType
+ * @param string $phpType
* @return string
*/
public function scanRegisteredTypes($phpType)
{
+
if (array_key_exists($phpType, $this->getContext()->getTypes())) {
$soapTypes = $this->getContext()->getTypes();
return $soapTypes[$phpType];
}
-
return null;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
index bca4780dabd016ac9a3db5d32eb87095be732269..263650540491ecaaf0711f98e906a29c98fd05b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
@@ -9,29 +9,27 @@
namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
-/**
- * Zend_Soap_Wsdl_Strategy_AnyType
- */
+use Zend\Soap\Wsdl;
+
class AnyType implements ComplexTypeStrategyInterface
{
/**
* Not needed in this strategy.
*
- * @param \Zend\Soap\Wsdl $context
+ * @param Wsdl $context
*/
- public function setContext(\Zend\Soap\Wsdl $context)
+ public function setContext(Wsdl $context)
{
-
}
/**
* Returns xsd:anyType regardless of the input.
*
- * @param string $type
+ * @param string $type
* @return string
*/
public function addComplexType($type)
{
- return 'xsd:anyType';
+ return Wsdl::XSD_NS . ':anyType';
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
index 275ae99d504d082d8d23011c980226df27bb375e..b9b4a4c733caf7c926b4f7ab5d9be9748d56b9d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
@@ -10,18 +10,17 @@
namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
use Zend\Soap\Exception;
+use Zend\Soap\Wsdl;
-/**
- * ArrayOfTypeComplex strategy
- */
class ArrayOfTypeComplex extends DefaultComplexType
{
/**
- * Add an ArrayOfType based on the xsd:complexType syntax if type[] is detected in return value doc comment.
+ * Add an ArrayOfType based on the xsd:complexType syntax if type[] is
+ * detected in return value doc comment.
*
- * @param string $type
- * @throws Exception\InvalidArgumentException
+ * @param string $type
* @return string tns:xsd-type
+ * @throws Exception\InvalidArgumentException
*/
public function addComplexType($type)
{
@@ -34,22 +33,25 @@ class ArrayOfTypeComplex extends DefaultComplexType
if ($nestingLevel == 0) {
return parent::addComplexType($singularType);
- } elseif ($nestingLevel == 1) {
- // The following blocks define the Array of Object structure
- return $this->_addArrayOfComplexType($singularType, $type);
- } else {
+ }
+
+ if ($nestingLevel != 1) {
throw new Exception\InvalidArgumentException(
- 'ArrayOfTypeComplex cannot return nested ArrayOfObject deeper than '
- . 'one level. Use array object properties to return deep nested data.'
+ 'ArrayOfTypeComplex cannot return nested ArrayOfObject deeper than one level. '
+ . 'Use array object properties to return deep nested data.'
);
}
+
+ // The following blocks define the Array of Object structure
+ return $this->_addArrayOfComplexType($singularType, $type);
}
/**
- * Add an ArrayOfType based on the xsd:complexType syntax if type[] is detected in return value doc comment.
+ * Add an ArrayOfType based on the xsd:complexType syntax if type[] is
+ * detected in return value doc comment.
*
- * @param string $singularType e.g. '\MyNamespace\MyClassname'
- * @param string $type e.g. '\MyNamespace\MyClassname[]'
+ * @param string $singularType e.g. '\MyNamespace\MyClassname'
+ * @param string $type e.g. '\MyNamespace\MyClassname[]'
* @return string tns:xsd-type e.g. 'tns:ArrayOfMyNamespace.MyClassname'
*/
protected function _addArrayOfComplexType($singularType, $type)
@@ -59,7 +61,7 @@ class ArrayOfTypeComplex extends DefaultComplexType
}
$xsdComplexTypeName = 'ArrayOf' . $this->getContext()->translateType($singularType);
- $xsdComplexType = 'tns:' . $xsdComplexTypeName;
+ $xsdComplexType = Wsdl::TYPES_NS . ':' . $xsdComplexTypeName;
// Register type here to avoid recursion
$this->getContext()->addType($type, $xsdComplexType);
@@ -71,23 +73,27 @@ class ArrayOfTypeComplex extends DefaultComplexType
// Add array type structure to WSDL document
$dom = $this->getContext()->toDomDocument();
- $complexType = $dom->createElement('xsd:complexType');
+ $complexType = $dom->createElementNS(Wsdl::XSD_NS_URI, 'complexType');
+ $this->getContext()->getSchema()->appendChild($complexType);
+
$complexType->setAttribute('name', $xsdComplexTypeName);
- $complexContent = $dom->createElement('xsd:complexContent');
+ $complexContent = $dom->createElementNS(Wsdl::XSD_NS_URI, 'complexContent');
$complexType->appendChild($complexContent);
- $xsdRestriction = $dom->createElement('xsd:restriction');
- $xsdRestriction->setAttribute('base', 'soap-enc:Array');
+ $xsdRestriction = $dom->createElementNS(Wsdl::XSD_NS_URI, 'restriction');
$complexContent->appendChild($xsdRestriction);
+ $xsdRestriction->setAttribute('base', Wsdl::SOAP_ENC_NS . ':Array');
- $xsdAttribute = $dom->createElement('xsd:attribute');
- $xsdAttribute->setAttribute('ref', 'soap-enc:arrayType');
- $xsdAttribute->setAttribute('wsdl:arrayType',
- 'tns:' . $this->getContext()->translateType($singularType) . '[]');
+ $xsdAttribute = $dom->createElementNS(Wsdl::XSD_NS_URI, 'attribute');
$xsdRestriction->appendChild($xsdAttribute);
- $this->getContext()->getSchema()->appendChild($complexType);
+ $xsdAttribute->setAttribute('ref', Wsdl::SOAP_ENC_NS . ':arrayType');
+ $xsdAttribute->setAttributeNS(
+ Wsdl::WSDL_NS_URI,
+ 'arrayType',
+ Wsdl::TYPES_NS . ':' . $this->getContext()->translateType($singularType) . '[]'
+ );
return $xsdComplexType;
}
@@ -107,7 +113,7 @@ class ArrayOfTypeComplex extends DefaultComplexType
* Return the array nesting level based on the type name
*
* @param string $type
- * @return integer
+ * @return int
*/
protected function _getNestedCount($type)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
index eec9b26035182871a1409d965db9faa10fd10c99..0c223bda1b474582d76d94ad7935c6063918a27c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
@@ -9,15 +9,15 @@
namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
-/**
- * Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence
- */
+use Zend\Soap\Wsdl;
+
class ArrayOfTypeSequence extends DefaultComplexType
{
/**
- * Add an unbounded ArrayOfType based on the xsd:sequence syntax if type[] is detected in return value doc comment.
+ * Add an unbounded ArrayOfType based on the xsd:sequence syntax if
+ * type[] is detected in return value doc comment.
*
- * @param string $type
+ * @param string $type
* @return string tns:xsd-type
*/
public function addComplexType($type)
@@ -26,6 +26,7 @@ class ArrayOfTypeSequence extends DefaultComplexType
if ($nestedCounter > 0) {
$singularType = $this->_getSingularType($type);
+ $complexType = '';
for ($i = 1; $i <= $nestedCounter; $i++) {
$complexType = $this->_getTypeBasedOnNestingLevel($singularType, $i);
@@ -36,17 +37,20 @@ class ArrayOfTypeSequence extends DefaultComplexType
}
return $complexType;
- } elseif (($soapType = $this->scanRegisteredTypes($type)) !== null) {
+ }
+
+ if (($soapType = $this->scanRegisteredTypes($type)) !== null) {
// Existing complex type
return $soapType;
- } else {
- // New singular complex type
- return parent::addComplexType($type);
}
+
+ // New singular complex type
+ return parent::addComplexType($type);
}
/**
- * Return the ArrayOf or simple type name based on the singular xsdtype and the nesting level
+ * Return the ArrayOf or simple type name based on the singular xsdtype
+ * and the nesting level
*
* @param string $singularType
* @param int $level
@@ -59,7 +63,7 @@ class ArrayOfTypeSequence extends DefaultComplexType
return $this->getContext()->getType($singularType);
}
- return 'tns:' . str_repeat('ArrayOf', $level) . ucfirst($this->getContext()->translateType($singularType));
+ return Wsdl::TYPES_NS . ':' . str_repeat('ArrayOf', $level) . ucfirst($this->getContext()->translateType($singularType));
}
/**
@@ -77,7 +81,7 @@ class ArrayOfTypeSequence extends DefaultComplexType
* Return the array nesting level based on the type name
*
* @param string $type
- * @return integer
+ * @return int
*/
protected function _getNestedCount($type)
{
@@ -90,7 +94,6 @@ class ArrayOfTypeSequence extends DefaultComplexType
* @param string $arrayType Array type name (e.g. 'tns:ArrayOfArrayOfInt')
* @param string $childType Qualified array items type (e.g. 'xsd:int', 'tns:ArrayOfInt')
* @param string $phpArrayType PHP type (e.g. 'int[][]', '\MyNamespace\MyClassName[][][]')
- * @return void
*/
protected function _addSequenceType($arrayType, $childType, $phpArrayType)
{
@@ -106,20 +109,20 @@ class ArrayOfTypeSequence extends DefaultComplexType
$arrayTypeName = substr($arrayType, strpos($arrayType, ':') + 1);
- $complexType = $dom->createElement('xsd:complexType');
+ $complexType = $dom->createElementNS(Wsdl::XSD_NS_URI, 'complexType');
+ $this->getContext()->getSchema()->appendChild($complexType);
+
$complexType->setAttribute('name', $arrayTypeName);
- $sequence = $dom->createElement('xsd:sequence');
+ $sequence = $dom->createElementNS(Wsdl::XSD_NS_URI, 'sequence');
+ $complexType->appendChild($sequence);
+
+ $element = $dom->createElementNS(Wsdl::XSD_NS_URI, 'element');
+ $sequence->appendChild($element);
- $element = $dom->createElement('xsd:element');
$element->setAttribute('name', 'item');
$element->setAttribute('type', $childType);
$element->setAttribute('minOccurs', 0);
$element->setAttribute('maxOccurs', 'unbounded');
- $sequence->appendChild($element);
-
- $complexType->appendChild($sequence);
-
- $this->getContext()->getSchema()->appendChild($complexType);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
index 9939c824956353ad4bfa8258c2bbe136c7168796..ea8f0a1272fd8f339483855e1ca5a4650223e250 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
@@ -13,29 +13,23 @@ use Zend\Soap\Exception;
use Zend\Soap\Wsdl;
use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
-/**
- * Zend_Soap_Wsdl_Strategy_Composite
- */
class Composite implements ComplexTypeStrategy
{
/**
* Typemap of Complex Type => Strategy pairs.
- *
* @var array
*/
protected $typeMap = array();
/**
* Default Strategy of this composite
- *
* @var string|ComplexTypeStrategy
*/
protected $defaultStrategy;
/**
* Context WSDL file that this composite serves
- *
- * @var \Zend\Soap\Wsdl|null
+ * @var Wsdl|null
*/
protected $context;
@@ -45,21 +39,24 @@ class Composite implements ComplexTypeStrategy
* @param array $typeMap
* @param string|ComplexTypeStrategy $defaultStrategy
*/
- public function __construct(array $typeMap=array(), $defaultStrategy='\Zend\Soap\Wsdl\ComplexTypeStrategy\DefaultComplexType')
- {
- foreach ($typeMap AS $type => $strategy) {
+ public function __construct(
+ array $typeMap = array(),
+ $defaultStrategy = 'Zend\Soap\Wsdl\ComplexTypeStrategy\DefaultComplexType'
+ ) {
+ foreach ($typeMap as $type => $strategy) {
$this->connectTypeToStrategy($type, $strategy);
}
+
$this->defaultStrategy = $defaultStrategy;
}
/**
* Connect a complex type to a given strategy.
*
- * @throws Exception\InvalidArgumentException
* @param string $type
* @param string|ComplexTypeStrategy $strategy
* @return Composite
+ * @throws Exception\InvalidArgumentException
*/
public function connectTypeToStrategy($type, $strategy)
{
@@ -73,8 +70,8 @@ class Composite implements ComplexTypeStrategy
/**
* Return default strategy of this composite
*
- * @throws Exception\InvalidArgumentException
* @return ComplexTypeStrategy
+ * @throws Exception\InvalidArgumentException
*/
public function getDefaultStrategy()
{
@@ -82,7 +79,7 @@ class Composite implements ComplexTypeStrategy
if (is_string($strategy) && class_exists($strategy)) {
$strategy = new $strategy;
}
- if ( !($strategy instanceof ComplexTypeStrategy) ) {
+ if (!($strategy instanceof ComplexTypeStrategy)) {
throw new Exception\InvalidArgumentException(
'Default Strategy for Complex Types is not a valid strategy object.'
);
@@ -94,9 +91,9 @@ class Composite implements ComplexTypeStrategy
/**
* Return specific strategy or the default strategy of this type.
*
- * @throws Exception\InvalidArgumentException
- * @param string $type
+ * @param string $type
* @return ComplexTypeStrategy
+ * @throws Exception\InvalidArgumentException
*/
public function getStrategyOfType($type)
{
@@ -107,7 +104,7 @@ class Composite implements ComplexTypeStrategy
$strategy = new $strategy();
}
- if ( !($strategy instanceof ComplexTypeStrategy) ) {
+ if (!($strategy instanceof ComplexTypeStrategy)) {
throw new Exception\InvalidArgumentException(sprintf(
'Strategy for Complex Type "%s" is not a valid strategy object.',
$type
@@ -117,13 +114,14 @@ class Composite implements ComplexTypeStrategy
} else {
$strategy = $this->getDefaultStrategy();
}
+
return $strategy;
}
/**
* Method accepts the current WSDL context file.
*
- * @param \Zend\Soap\Wsdl $context
+ * @param Wsdl $context
* @return Composite
*/
public function setContext(Wsdl $context)
@@ -135,13 +133,13 @@ class Composite implements ComplexTypeStrategy
/**
* Create a complex type based on a strategy
*
- * @throws Exception\InvalidArgumentException
* @param string $type
* @return string XSD type
+ * @throws Exception\InvalidArgumentException
*/
public function addComplexType($type)
{
- if (!($this->context instanceof Wsdl) ) {
+ if (!($this->context instanceof Wsdl)) {
throw new Exception\InvalidArgumentException(sprintf(
'Cannot add complex type "%s", no context is set for this composite strategy.',
$type
@@ -150,6 +148,7 @@ class Composite implements ComplexTypeStrategy
$strategy = $this->getStrategyOfType($type);
$strategy->setContext($this->context);
+
return $strategy->addComplexType($type);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
index 2a10aaf495415e69f84f1e82ef7bee9bbb010d76..779cd2bf2891ecbfe87f1bc94a5d612dc9208629 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
@@ -9,19 +9,18 @@
namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
+use ReflectionClass;
use Zend\Soap\Exception;
+use Zend\Soap\Wsdl;
-/**
- * Zend_Soap_Wsdl_Strategy_DefaultComplexType
- */
class DefaultComplexType extends AbstractComplexTypeStrategy
{
/**
* Add a complex type by recursively using all the class properties fetched via Reflection.
*
* @param string $type Name of the class to be specified
- * @throws Exception\InvalidArgumentException if class does not exist
* @return string XSD Type for the given PHP type
+ * @throws Exception\InvalidArgumentException if class does not exist
*/
public function addComplexType($type)
{
@@ -38,10 +37,10 @@ class DefaultComplexType extends AbstractComplexTypeStrategy
}
$dom = $this->getContext()->toDomDocument();
- $class = new \ReflectionClass($type);
+ $class = new ReflectionClass($type);
$soapTypeName = $this->getContext()->translateType($type);
- $soapType = 'tns:' . $soapTypeName;
+ $soapType = Wsdl::TYPES_NS . ':' . $soapTypeName;
// Register type here to avoid recursion
$this->getContext()->addType($type, $soapType);
@@ -49,19 +48,20 @@ class DefaultComplexType extends AbstractComplexTypeStrategy
$defaultProperties = $class->getDefaultProperties();
- $complexType = $dom->createElement('xsd:complexType');
+ $complexType = $dom->createElementNS(Wsdl::XSD_NS_URI, 'complexType');
$complexType->setAttribute('name', $soapTypeName);
- $all = $dom->createElement('xsd:all');
+ $all = $dom->createElementNS(Wsdl::XSD_NS_URI, 'all');
foreach ($class->getProperties() as $property) {
if ($property->isPublic() && preg_match_all('/@var\s+([^\s]+)/m', $property->getDocComment(), $matches)) {
/**
- * @todo check if 'xsd:element' must be used here (it may not be compatible with using 'complexType'
- * node for describing other classes used as attribute types for current class
+ * @todo check if 'xsd:element' must be used here (it may not be
+ * compatible with using 'complexType' node for describing other
+ * classes used as attribute types for current class
*/
- $element = $dom->createElement('xsd:element');
+ $element = $dom->createElementNS(Wsdl::XSD_NS_URI, 'element');
$element->setAttribute('name', $propertyName = $property->getName());
$element->setAttribute('type', $this->getContext()->getType(trim($matches[1][0])));
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/composer.json b/vendor/zendframework/zendframework/library/Zend/Soap/composer.json
index 4cce72a7f8cc948b849f89504281620687b0b1bf..fe3190017c2771ea9bcd2a4415912c50b716ee77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
index 4d0f44d473598303e4109fdbecc7456d63f4cbf2..9a71605e728e0c017ad2007733069ca4bd0ca489 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
@@ -24,10 +24,9 @@ abstract class PhpLegacyCompatibility extends PhpArrayObject
/**
* Constructor
*
- * @param array $input
- * @param int $flags
- * @param string $iteratorClass
- * @return ArrayObject
+ * @param array $input
+ * @param int $flags
+ * @param string $iteratorClass
*/
public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
index 9e680abbf91c4b75e687c6abd663c196f9aefa60..e25257c761b124c77d2b5f5bf60c27da5d7c7933 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
@@ -59,10 +59,9 @@ abstract class PhpReferenceCompatibility implements IteratorAggregate, ArrayAcce
/**
* Constructor
*
- * @param array $input
- * @param int $flags
- * @param string $iteratorClass
- * @return ArrayObject
+ * @param array $input
+ * @param int $flags
+ * @param string $iteratorClass
*/
public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
{
@@ -76,7 +75,7 @@ abstract class PhpReferenceCompatibility implements IteratorAggregate, ArrayAcce
* Returns whether the requested key exists
*
* @param mixed $key
- * @return boolean
+ * @return bool
*/
public function __isset($key)
{
@@ -279,7 +278,7 @@ abstract class PhpReferenceCompatibility implements IteratorAggregate, ArrayAcce
* Returns whether the requested key exists
*
* @param mixed $key
- * @return boolean
+ * @return bool
*/
public function offsetExists($key)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php
index b073f3b4501dbb2c07af0352577bbbdcf6ef4d9a..4261d2e65fa94c2f9ef204fee38f379ea10bdff2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php
@@ -93,11 +93,11 @@ abstract class ArrayUtils
*
* For example:
* <code>
- * $list = array( 'a','b','c','d' );
+ * $list = array('a', 'b', 'c', 'd');
* $list = array(
* 0 => 'foo',
* 1 => 'bar',
- * 2 => array( 'foo' => 'baz' ),
+ * 2 => array('foo' => 'baz'),
* );
* </code>
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
index bd60a6756dcb094e3ba779bcbaf949404d93d142..f1ac4a65b36d9713f6295f3d2e2bf59e158e6866 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
@@ -11,7 +11,6 @@ namespace Zend\Stdlib;
use Closure;
use ReflectionClass;
-use WeakRef;
/**
* CallbackHandler
@@ -39,12 +38,6 @@ class CallbackHandler
*/
protected static $isPhp54;
- /**
- * Is pecl/weakref extension installed?
- * @var bool
- */
- protected static $hasWeakRefExtension;
-
/**
* Constructor
*
@@ -60,13 +53,6 @@ class CallbackHandler
/**
* Registers the callback provided in the constructor
*
- * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed,
- * this method provides additional behavior.
- *
- * If a callback is a functor, or an array callback composing an object
- * instance, this method will pass the object to a WeakRef instance prior
- * to registering the callback.
- *
* @param callable $callback
* @throws Exception\InvalidCallbackException
* @return void
@@ -77,44 +63,7 @@ class CallbackHandler
throw new Exception\InvalidCallbackException('Invalid callback provided; not callable');
}
- if (null === static::$hasWeakRefExtension) {
- static::$hasWeakRefExtension = class_exists('WeakRef');
- }
-
- // If pecl/weakref is not installed, simply store the callback and return
- if (!static::$hasWeakRefExtension) {
- $this->callback = $callback;
- return;
- }
-
- // If WeakRef exists, we want to use it.
-
- // If we have a non-closure object, pass it to WeakRef, and then
- // register it.
- if (is_object($callback) && !$callback instanceof Closure) {
- $this->callback = new WeakRef($callback);
- return;
- }
-
- // If we have a string or closure, register as-is
- if (!is_array($callback)) {
- $this->callback = $callback;
- return;
- }
-
- list($target, $method) = $callback;
-
- // If we have an array callback, and the first argument is not an
- // object, register as-is
- if (!is_object($target)) {
- $this->callback = $callback;
- return;
- }
-
- // We have an array callback with an object as the first argument;
- // pass it to WeakRef, and then register the new callback
- $target = new WeakRef($target);
- $this->callback = array($target, $method);
+ $this->callback = $callback;
}
/**
@@ -124,32 +73,7 @@ class CallbackHandler
*/
public function getCallback()
{
- $callback = $this->callback;
-
- // String callbacks -- simply return
- if (is_string($callback)) {
- return $callback;
- }
-
- // WeakRef callbacks -- pull it out of the object and return it
- if ($callback instanceof WeakRef) {
- return $callback->get();
- }
-
- // Non-WeakRef object callback -- return it
- if (is_object($callback)) {
- return $callback;
- }
-
- // Array callback with WeakRef object -- retrieve the object first, and
- // then return
- list($target, $method) = $callback;
- if ($target instanceof WeakRef) {
- return array($target->get(), $method);
- }
-
- // Otherwise, return it
- return $callback;
+ return $this->callback;
}
/**
@@ -162,11 +86,6 @@ class CallbackHandler
{
$callback = $this->getCallback();
- // WeakRef object will return null if the real object was disposed
- if (null === $callback) {
- return null;
- }
-
// Minor performance tweak, if the callback gets called more than once
if (!isset(static::$isPhp54)) {
static::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>=');
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php
index 308a25b530fa9403fa46be7ce1905a1ca733ef41..5c88ad4732cdef1abcbc31cf0033d3099ad0ae4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php
@@ -11,10 +11,14 @@ namespace Zend\Stdlib;
use DateTimeZone;
+trigger_error('DateTime extension deprecated as of ZF 2.1.4; use the \DateTime constructor to parse extended ISO8601 dates instead', E_USER_DEPRECATED);
+
/**
* DateTime
*
* An extension of the \DateTime object.
+ *
+ * @deprecated
*/
class DateTime extends \DateTime
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php
index 92f399575f8dcba39afe2a128817d3710c16046c..5096f53d9d32028fe426ea93b45b639bd0561c3a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php
@@ -27,7 +27,7 @@ abstract class ErrorHandler
/**
* Check if this error handler is active
*
- * @return boolean
+ * @return bool
*/
public static function started()
{
@@ -109,7 +109,7 @@ abstract class ErrorHandler
*/
public static function addError($errno, $errstr = '', $errfile = '', $errline = 0)
{
- $stack = & static::$stack[ count(static::$stack) - 1 ];
+ $stack = & static::$stack[count(static::$stack) - 1];
$stack = new ErrorException($errstr, 0, $errno, $errfile, $errline, $stack);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
index b40f0d9a20a7d8f043a872285929d3aa87ac77f6..a9e29fd0c68082fc53de6da662c85bd3e0128f73 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
@@ -9,6 +9,9 @@
namespace Zend\Stdlib;
+use Zend\Stdlib\Exception;
+use Zend\Stdlib\ErrorHandler;
+
/**
* Wrapper for glob with fallback if GLOB_BRACE is not available.
*/
@@ -31,11 +34,12 @@ abstract class Glob
*
* @see http://docs.php.net/glob
* @param string $pattern
- * @param integer $flags
+ * @param int $flags
* @param bool $forceFallback
- * @return array|false
+ * @return array
+ * @throws Exception\RuntimeException
*/
- public static function glob($pattern, $flags, $forceFallback = false)
+ public static function glob($pattern, $flags = 0, $forceFallback = false)
{
if (!defined('GLOB_BRACE') || $forceFallback) {
return static::fallbackGlob($pattern, $flags);
@@ -48,8 +52,9 @@ abstract class Glob
* Use the glob function provided by the system.
*
* @param string $pattern
- * @param integer $flags
- * @return array|false
+ * @param int $flags
+ * @return array
+ * @throws Exception\RuntimeException
*/
protected static function systemGlob($pattern, $flags)
{
@@ -75,15 +80,22 @@ abstract class Glob
$globFlags = 0;
}
- return glob($pattern, $globFlags);
+ ErrorHandler::start();
+ $res = glob($pattern, $globFlags);
+ $err = ErrorHandler::stop();
+ if ($res === false) {
+ throw new Exception\RuntimeException("glob('{$pattern}', {$globFlags}) failed", 0, $err);
+ }
+ return $res;
}
/**
* Expand braces manually, then use the system glob.
*
* @param string $pattern
- * @param integer $flags
- * @return array|false
+ * @param int $flags
+ * @return array
+ * @throws Exception\RuntimeException
*/
protected static function fallbackGlob($pattern, $flags)
{
@@ -162,9 +174,9 @@ abstract class Glob
* Find the end of the sub-pattern in a brace expression.
*
* @param string $pattern
- * @param integer $begin
- * @param integer $flags
- * @return integer|null
+ * @param int $begin
+ * @param int $flags
+ * @return int|null
*/
protected static function nextBraceSub($pattern, $begin, $flags)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
index b7af0d2b1ebb2024d5de4ee46b1314d06086faa1..4cb9a4356f724c27187bd3b27a6a2c40715839a0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
@@ -102,15 +102,16 @@ abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInt
/**
* Converts a value for extraction. If no strategy exists the plain value is returned.
*
- * @param string $name The name of the strategy to use.
- * @param mixed $value The value that should be converted.
+ * @param string $name The name of the strategy to use.
+ * @param mixed $value The value that should be converted.
+ * @param array $object The object is optionally provided as context.
* @return mixed
*/
- public function extractValue($name, $value)
+ public function extractValue($name, $value, $object = null)
{
if ($this->hasStrategy($name)) {
$strategy = $this->getStrategy($name);
- $value = $strategy->extract($value);
+ $value = $strategy->extract($value, $object);
}
return $value;
}
@@ -120,13 +121,14 @@ abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInt
*
* @param string $name The name of the strategy to use.
* @param mixed $value The value that should be converted.
+ * @param array $data The whole data is optionally provided as context.
* @return mixed
*/
- public function hydrateValue($name, $value)
+ public function hydrateValue($name, $value, $data = null)
{
if ($this->hasStrategy($name)) {
$strategy = $this->getStrategy($name);
- $value = $strategy->hydrate($value);
+ $value = $strategy->hydrate($value, $data);
}
return $value;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
new file mode 100644
index 0000000000000000000000000000000000000000..bdcf1eb0adfdbad7ac0af43365373cdbe28fa78c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator\Aggregate;
+
+use Zend\EventManager\EventManager;
+use Zend\EventManager\EventManagerAwareInterface;
+use Zend\EventManager\EventManagerInterface;
+use Zend\Stdlib\Exception;
+use Zend\Stdlib\Hydrator\Filter\FilterComposite;
+use Zend\Stdlib\Hydrator\HydratorInterface;
+
+/**
+ * Aggregate hydrator that composes multiple hydrators via events
+ */
+class AggregateHydrator implements HydratorInterface, EventManagerAwareInterface
+{
+ const DEFAULT_PRIORITY = 1;
+
+ /**
+ * @var \Zend\EventManager\EventManagerInterface|null
+ */
+ protected $eventManager;
+
+ /**
+ * Attaches the provided hydrator to the list of hydrators to be used while hydrating/extracting data
+ *
+ * @param \Zend\Stdlib\Hydrator\HydratorInterface $hydrator
+ * @param int $priority
+ */
+ public function add(HydratorInterface $hydrator, $priority = self::DEFAULT_PRIORITY)
+ {
+ $this->getEventManager()->attachAggregate(new HydratorListener($hydrator), $priority);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function extract($object)
+ {
+ $event = new ExtractEvent($this, $object);
+
+ $this->getEventManager()->trigger($event);
+
+ return $event->getExtractedData();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function hydrate(array $data, $object)
+ {
+ $event = new HydrateEvent($this, $object, $data);
+
+ $this->getEventManager()->trigger($event);
+
+ return $event->getHydratedObject();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function setEventManager(EventManagerInterface $eventManager)
+ {
+ $eventManager->setIdentifiers(array(__CLASS__, get_class($this)));
+
+ $this->eventManager = $eventManager;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getEventManager()
+ {
+ if (null === $this->eventManager) {
+ $this->setEventManager(new EventManager());
+ }
+
+ return $this->eventManager;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
new file mode 100644
index 0000000000000000000000000000000000000000..dfdfbcfb6b508183c4b4a0b22ae23790df395b0e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator\Aggregate;
+
+
+use Zend\EventManager\Event;
+
+/**
+ * Event triggered when the {@see \Zend\Stdlib\Hydrator\Aggregate\AggregateHydrator} extracts
+ * data from an object
+ */
+class ExtractEvent extends Event
+{
+ const EVENT_EXTRACT = 'extract';
+
+ /**
+ * {@inheritDoc}
+ */
+ protected $name = self::EVENT_EXTRACT;
+
+ /**
+ * @var object
+ */
+ protected $extractionObject;
+
+ /**
+ * @var array
+ */
+ protected $extractedData = array();
+
+ /**
+ * @param object $target
+ * @param object $extractionObject
+ */
+ public function __construct($target, $extractionObject)
+ {
+ $this->target = $target;
+ $this->extractionObject = $extractionObject;
+ }
+
+ /**
+ * Retrieves the object from which data is extracted
+ *
+ * @return object
+ */
+ public function getExtractionObject()
+ {
+ return $this->extractionObject;
+ }
+
+ /**
+ * @param object $extractionObject
+ *
+ * @return void
+ */
+ public function setExtractionObject($extractionObject)
+ {
+ $this->extractionObject = $extractionObject;
+ }
+
+ /**
+ * Retrieves the data that has been extracted
+ *
+ * @return array
+ */
+ public function getExtractedData()
+ {
+ return $this->extractedData;
+ }
+
+ /**
+ * @param array $extractedData
+ *
+ * @return void
+ */
+ public function setExtractedData(array $extractedData)
+ {
+ $this->extractedData = $extractedData;
+ }
+
+ /**
+ * Merge provided data with the extracted data
+ *
+ * @param array $additionalData
+ *
+ * @return void
+ */
+ public function mergeExtractedData(array $additionalData)
+ {
+ $this->extractedData = array_merge($this->extractedData, $additionalData);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
new file mode 100644
index 0000000000000000000000000000000000000000..11bab0237974918d80a6d01c736b3e4ef7d51ac9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator\Aggregate;
+
+
+use Zend\EventManager\Event;
+
+/**
+ * Event triggered when the {@see \Zend\Stdlib\Hydrator\Aggregate\AggregateHydrator} hydrates
+ * data into an object
+ */
+class HydrateEvent extends Event
+{
+ const EVENT_HYDRATE = 'hydrate';
+
+ /**
+ * {@inheritDoc}
+ */
+ protected $name = self::EVENT_HYDRATE;
+
+ /**
+ * @var object
+ */
+ protected $hydratedObject;
+
+ /**
+ * @var array
+ */
+ protected $hydrationData;
+
+ /**
+ * @param object $target
+ * @param object $hydratedObject
+ * @param array $hydrationData
+ */
+ public function __construct($target, $hydratedObject, array $hydrationData)
+ {
+ $this->target = $target;
+ $this->hydratedObject = $hydratedObject;
+ $this->hydrationData = $hydrationData;
+ }
+
+ /**
+ * Retrieves the object that is being hydrated
+ *
+ * @return object
+ */
+ public function getHydratedObject()
+ {
+ return $this->hydratedObject;
+ }
+
+ /**
+ * @param object $hydratedObject
+ */
+ public function setHydratedObject($hydratedObject)
+ {
+ $this->hydratedObject = $hydratedObject;
+ }
+
+ /**
+ * Retrieves the data that is being used for hydration
+ *
+ * @return array
+ */
+ public function getHydrationData()
+ {
+ return $this->hydrationData;
+ }
+
+ /**
+ * @param array $hydrationData
+ */
+ public function setHydrationData(array $hydrationData)
+ {
+ $this->hydrationData = $hydrationData;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..68cc67274cb96510c9ac58daa1cb01efeb8fcdaf
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator\Aggregate;
+
+
+use Zend\EventManager\AbstractListenerAggregate;
+use Zend\EventManager\EventManagerInterface;
+use Zend\Stdlib\Hydrator\HydratorInterface;
+
+/**
+ * Aggregate listener wrapping around a hydrator. Listens
+ * to {@see \Zend\Stdlib\Hydrator\Aggregate::EVENT_HYDRATE} and
+ * {@see \Zend\Stdlib\Hydrator\Aggregate::EVENT_EXTRACT}
+ */
+class HydratorListener extends AbstractListenerAggregate
+{
+ /**
+ * @var \Zend\Stdlib\Hydrator\HydratorInterface
+ */
+ protected $hydrator;
+
+ /**
+ * @param \Zend\Stdlib\Hydrator\HydratorInterface $hydrator
+ */
+ public function __construct(HydratorInterface $hydrator)
+ {
+ $this->hydrator = $hydrator;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function attach(EventManagerInterface $events)
+ {
+ $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, array($this, 'onHydrate'));
+ $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, array($this, 'onExtract'));
+ }
+
+ /**
+ * Callback to be used when {@see \Zend\Stdlib\Hydrator\Aggregate\HydrateEvent::EVENT_HYDRATE} is triggered
+ *
+ * @param \Zend\Stdlib\Hydrator\Aggregate\HydrateEvent $event
+ *
+ * @return object
+ *
+ * @internal
+ */
+ public function onHydrate(HydrateEvent $event)
+ {
+ $object = $this->hydrator->hydrate($event->getHydrationData(), $event->getHydratedObject());
+
+ $event->setHydratedObject($object);
+
+ return $object;
+ }
+
+ /**
+ * Callback to be used when {@see \Zend\Stdlib\Hydrator\Aggregate\ExtractEvent::EVENT_EXTRACT} is triggered
+ *
+ * @param \Zend\Stdlib\Hydrator\Aggregate\ExtractEvent $event
+ *
+ * @return array
+ *
+ * @internal
+ */
+ public function onExtract(ExtractEvent $event)
+ {
+ $data = $this->hydrator->extract($event->getExtractionObject());
+
+ $event->mergeExtractedData($data);
+
+ return $data;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php
index 09dfebba1cd348c9d5e28d3b30728253d1597f93..d9631122e15e547608afba8e4fb2cbeaaca0d601 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php
@@ -31,15 +31,16 @@ class ArraySerializable extends AbstractHydrator
));
}
- $self = $this;
$data = $object->getArrayCopy();
- array_walk($data, function (&$value, $name) use ($self, &$data) {
- if (!$self->getFilter()->filter($name)) {
+
+ foreach ($data as $name => $value) {
+ if (!$this->getFilter()->filter($name)) {
unset($data[$name]);
- } else {
- $value = $self->extractValue($name, $value);
+ continue;
}
- });
+
+ $data[$name] = $this->extractValue($name, $value);
+ }
return $data;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
index 5ad76c0a73d6203f8865ea5950962d17009543a4..e0c3f99ed4735839d9aeacc0cfc317c8796c8d09 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
@@ -15,10 +15,10 @@ use Zend\Stdlib\Exception;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\Hydrator\Filter\FilterComposite;
use Zend\Stdlib\Hydrator\Filter\FilterProviderInterface;
-use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter;
use Zend\Stdlib\Hydrator\Filter\GetFilter;
use Zend\Stdlib\Hydrator\Filter\HasFilter;
use Zend\Stdlib\Hydrator\Filter\IsFilter;
+use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter;
use Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter;
class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
@@ -66,7 +66,7 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
}
/**
- * @param boolean $underscoreSeparatedKeys
+ * @param bool $underscoreSeparatedKeys
* @return ClassMethods
*/
public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
@@ -77,7 +77,7 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
}
/**
- * @return boolean
+ * @return bool
*/
public function getUnderscoreSeparatedKeys()
{
@@ -136,13 +136,15 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
$attribute = $method;
if (preg_match('/^get/', $method)) {
$attribute = substr($method, 3);
- $attribute = lcfirst($attribute);
+ if (!property_exists($object, $attribute)) {
+ $attribute = lcfirst($attribute);
+ }
}
if ($this->underscoreSeparatedKeys) {
$attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
}
- $attributes[$attribute] = $this->extractValue($attribute, $object->$method());
+ $attributes[$attribute] = $this->extractValue($attribute, $object->$method(), $object);
}
return $attributes;
@@ -178,13 +180,11 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
$method = preg_replace_callback('/(_[a-z])/', $transform, $method);
}
if (is_callable(array($object, $method))) {
- $value = $this->hydrateValue($property, $value);
-
+ $value = $this->hydrateValue($property, $value, $data);
$object->$method($value);
}
}
return $object;
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
index 179e209c3c9ac53187f32c0424906efaea401ecc..f5ce7e9c8d034856f3370521ddce2f64bcc2a44f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
@@ -96,7 +96,7 @@ class FilterComposite implements FilterInterface
*/
public function addFilter($name, $filter, $condition = self::CONDITION_OR)
{
- if ( !is_callable($filter) && !($filter instanceof FilterInterface) ) {
+ if (!is_callable($filter) && !($filter instanceof FilterInterface)) {
throw new InvalidArgumentException(
'The value of ' . $name . ' should be either a callable or ' .
'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
@@ -166,13 +166,13 @@ class FilterComposite implements FilterInterface
// Check if 1 from the or filters return true
foreach ($this->orFilter as $filter) {
if (is_callable($filter)) {
- if ( $filter($property) === true) {
+ if ($filter($property) === true) {
$returnValue = true;
break;
}
continue;
} else {
- if ( $filter->filter($property) === true) {
+ if ($filter->filter($property) === true) {
$returnValue = true;
break;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
index c9e2dd5a35a31e34a27d58aa0492e9962f364ee0..7f4e05289f3e6916dc2889221f5b8a890a190ccb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
@@ -9,8 +9,8 @@
namespace Zend\Stdlib\Hydrator\Filter;
-use ReflectionMethod;
use ReflectionException;
+use ReflectionMethod;
use Zend\Stdlib\Exception\InvalidArgumentException;
use Zend\Stdlib\Hydrator\Filter\FilterInterface;
@@ -39,7 +39,7 @@ class NumberOfParameterFilter implements FilterInterface
{
try {
$reflectionMethod = new ReflectionMethod($property);
- } catch( ReflectionException $exception) {
+ } catch (ReflectionException $exception) {
throw new InvalidArgumentException(
"Method $property doesn't exist"
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..f2784b3bb2848d3bf2034b99bde055d6979e7722
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+interface HydratorAwareInterface
+{
+ /**
+ * Set hydrator
+ *
+ * @param HydratorInterface $hydrator
+ * @return HydratorAwareInterface
+ */
+ public function setHydrator(HydratorInterface $hydrator);
+
+ /**
+ * Retrieve hydrator
+ *
+ * @return HydratorInterface
+ */
+ public function getHydrator();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e9892a25299f317212b2cde3ccdc7bd4c45b41b
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+use Zend\ServiceManager\AbstractPluginManager;
+use Zend\Stdlib\Exception;
+
+/**
+ * Plugin manager implementation for hydrators.
+ *
+ * Enforces that adapters retrieved are instances of HydratorInterface
+ */
+class HydratorPluginManager extends AbstractPluginManager
+{
+ /**
+ * Whether or not to share by default
+ *
+ * @var bool
+ */
+ protected $shareByDefault = false;
+
+ /**
+ * Default set of adapters
+ *
+ * @var array
+ */
+ protected $invokableClasses = array(
+ 'arrayserializable' => 'Zend\Stdlib\Hydrator\ArraySerializable',
+ 'classmethods' => 'Zend\Stdlib\Hydrator\ClassMethods',
+ 'objectproperty' => 'Zend\Stdlib\Hydrator\ObjectProperty',
+ 'reflection' => 'Zend\Stdlib\Hydrator\Reflection'
+ );
+
+ /**
+ * {@inheritDoc}
+ */
+ public function validatePlugin($plugin)
+ {
+ if ($plugin instanceof HydratorInterface) {
+ // we're okay
+ return;
+ }
+
+ throw new Exception\RuntimeException(sprintf(
+ 'Plugin of type %s is invalid; must implement Zend\Stdlib\Hydrator\HydratorInterface',
+ (is_object($plugin) ? get_class($plugin) : gettype($plugin))
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
index e212dc79a1be208e20e580483f7668b962ed2794..c0bf569a2fed3e96e0584ad8b77e5059cf3590dd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
@@ -30,15 +30,19 @@ class ObjectProperty extends AbstractHydrator
));
}
- $self = $this;
$data = get_object_vars($object);
- array_walk($data, function (&$value, $name) use ($self, &$data) {
- if (!$self->getFilter()->filter($name)) {
+
+ $filter = $this->getFilter();
+ foreach ($data as $name => $value) {
+ // Filter keys, removing any we don't want
+ if (!$filter->filter($name)) {
unset($data[$name]);
- } else {
- $value = $self->extractValue($name, $value);
+ continue;
}
- });
+ // Extract data
+ $data[$name] = $this->extractValue($name, $value);
+ }
+
return $data;
}
@@ -60,7 +64,7 @@ class ObjectProperty extends AbstractHydrator
));
}
foreach ($data as $property => $value) {
- $object->$property = $this->hydrateValue($property, $value);
+ $object->$property = $this->hydrateValue($property, $value, $data);
}
return $object;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php
index 6fe23020465873c5c59f7258a2f85308c79af91e..1c093c88b379e9476ba653c4ffad4100442e7706 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php
@@ -36,7 +36,7 @@ class Reflection extends AbstractHydrator
}
$value = $property->getValue($object);
- $result[$propertyName] = $this->extractValue($propertyName, $value);
+ $result[$propertyName] = $this->extractValue($propertyName, $value, $object);
}
return $result;
@@ -54,7 +54,7 @@ class Reflection extends AbstractHydrator
$reflProperties = self::getReflProperties($object);
foreach ($data as $key => $value) {
if (isset($reflProperties[$key])) {
- $reflProperties[$key]->setValue($object, $this->hydrateValue($key, $value));
+ $reflProperties[$key]->setValue($object, $this->hydrateValue($key, $value, $data));
}
}
return $object;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php
index ce463131fc3e86d590074662b746a6a6af073d38..2945f9aa6275ad1e93748de2f2424b2409cc8a25 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php
@@ -154,7 +154,7 @@ abstract class StringUtils
* Check if a given encoding is a known single-byte character encoding
*
* @param string $encoding
- * @return boolean
+ * @return bool
*/
public static function isSingleByteEncoding($encoding)
{
@@ -165,7 +165,7 @@ abstract class StringUtils
* Check if a given string is valid UTF-8 encoded
*
* @param string $str
- * @return boolean
+ * @return bool
*/
public static function isValidUtf8($str)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
index f62d87d0828680eb76b9cd834b16513ed1b8f336..e22649e7fa22adbef090dd697f080980723a1658 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
@@ -110,7 +110,7 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
* Convert a string from defined character encoding to the defined convert encoding
*
* @param string $str
- * @param boolean $reverse
+ * @param bool $reverse
* @return string|false
*/
public function convert($str, $reverse = false)
@@ -140,9 +140,9 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
* Wraps a string to a given number of characters
*
* @param string $string
- * @param integer $width
+ * @param int $width
* @param string $break
- * @param boolean $cut
+ * @param bool $cut
* @return string|false
*/
public function wordWrap($string, $width = 75, $break = "\n", $cut = false)
@@ -221,9 +221,9 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
* Pad a string to a certain length with another string
*
* @param string $input
- * @param integer $padLength
+ * @param int $padLength
* @param string $padString
- * @param integer $padType
+ * @param int $padType
* @return string
*/
public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT)
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php
index 55c12942f876f40a27b694ff0cb212b4bb263a96..35dc39a1c91c93198f52057623b31c3d28eb4b2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php
@@ -262,7 +262,7 @@ class Iconv extends AbstractStringWrapper
* Convert a string from defined encoding to the defined convert encoding
*
* @param string $str
- * @param boolean $reverse
+ * @param bool $reverse
* @return string|false
*/
public function convert($str, $reverse = false)
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php
index 31df0244c8b57b90464e33521644a15fe294fe76..cc47d6ee32eaea67be72613f1bbfdd2b957d099e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php
@@ -96,7 +96,7 @@ class MbString extends AbstractStringWrapper
* Convert a string from defined encoding to the defined convert encoding
*
* @param string $str
- * @param boolean $reverse
+ * @param bool $reverse
* @return string|false
*/
public function convert($str, $reverse = false)
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
index 0dea5720fd70a9a9d82b8801c1012431369ef827..974b0be48990a1c1bf6ed05252eca68ecd4d3c53 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
@@ -82,7 +82,7 @@ interface StringWrapperInterface
* Convert a string from defined encoding to the defined convert encoding
*
* @param string $str
- * @param boolean $reverse
+ * @param bool $reverse
* @return string|false
*/
public function convert($str, $reverse = false);
@@ -91,9 +91,9 @@ interface StringWrapperInterface
* Wraps a string to a given number of characters
*
* @param string $str
- * @param integer $width
+ * @param int $width
* @param string $break
- * @param boolean $cut
+ * @param bool $cut
* @return string
*/
public function wordWrap($str, $width = 75, $break = "\n", $cut = false);
@@ -102,9 +102,9 @@ interface StringWrapperInterface
* Pad a string to a certain length with another string
*
* @param string $input
- * @param integer $padLength
+ * @param int $padLength
* @param string $padString
- * @param integer $padType
+ * @param int $padType
* @return string
*/
public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT);
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json b/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json
index b644ae4fd90cd12f3521b62fde600683061a9b22..217c5eaa40ead6da3d90d99430c3998d1f10851f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json
@@ -13,15 +13,16 @@
},
"target-dir": "Zend/Stdlib",
"suggest": {
- "pecl-weakref": "Implementation of weak references for Stdlib\\CallbackHandler"
+ "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
+ "zendframework/zend-eventmanager": "To support aggregate hydrator usage"
},
"require": {
"php": ">=5.3.3"
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
index 1f71f59c9507c1f747f1dec478f531000dc74cf2..2993560358983d780c2e1045781e1d6a3245959d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
@@ -51,14 +51,14 @@ class HtmlTag extends AbstractTag
/**
* Maximum fontsize
*
- * @var integer
+ * @var int
*/
protected $maxFontSize = 20;
/**
* Minimum fontsize
*
- * @var integer
+ * @var int
*/
protected $minFontSize = 10;
@@ -152,7 +152,7 @@ class HtmlTag extends AbstractTag
/**
* Set maximum font size
*
- * @param integer $maxFontSize
+ * @param int $maxFontSize
* @throws InvalidArgumentException When fontsize is not numeric
* @return HTMLTag
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php b/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php
index 05976945808c2e403353a9e6e9afb81be6ba3f8b..ac12db9de63c979e35aa7047cafec13353a706e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php
@@ -27,7 +27,7 @@ class ItemList implements Countable, SeekableIterator, ArrayAccess
/**
* Count all items
*
- * @return integer
+ * @return int
*/
public function count()
{
@@ -97,7 +97,7 @@ class ItemList implements Countable, SeekableIterator, ArrayAccess
/**
* Seek to an absolute position
*
- * @param integer $index
+ * @param int $index
* @throws OutOfBoundsException When the seek position is invalid
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/composer.json b/vendor/zendframework/zendframework/library/Zend/Tag/composer.json
index 8f340ad5d280769ef01ee534dbd83fec3d680a0c..45900c0988cd61ca36c60c82e235930ecad7a4d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/composer.json
@@ -19,8 +19,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
index a94dbcba0278be449e8117cf9e64b6c1982fa56e..b394dc00f07a57f44bdbcdf997ec22f1ce10742a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
@@ -15,7 +15,7 @@ abstract class AbstractConsoleControllerTestCase extends AbstractControllerTestC
{
/**
* HTTP controller must use the console request
- * @var boolean
+ * @var bool
*/
protected $useConsoleRequest = true;
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
index 70d79c72e96b95ab8a839be28479286b94664101..6317577f4d63a06dd37f23b875b1ba8bebee619a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -19,7 +19,6 @@ use Zend\Stdlib\Exception\LogicException;
use Zend\Stdlib\Parameters;
use Zend\Stdlib\ResponseInterface;
use Zend\Uri\Http as HttpUri;
-use Zend\View\Helper\Placeholder;
abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
{
@@ -35,19 +34,19 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Flag to use console router or not
- * @var boolean
+ * @var bool
*/
protected $useConsoleRequest = false;
/**
* Flag console used before tests
- * @var boolean
+ * @var bool
*/
private $usedConsoleBackup;
/**
* Trace error when exception is throwed in application
- * @var boolean
+ * @var bool
*/
protected $traceError = false;
@@ -70,7 +69,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Get the trace error flag
- * @return boolean
+ * @return bool
*/
public function getTraceError()
{
@@ -79,7 +78,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Set the trace error flag
- * @param boolean $traceError
+ * @param bool $traceError
* @return AbstractControllerTestCase
*/
public function setTraceError($traceError)
@@ -90,7 +89,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Get the usage of the console router or not
- * @return boolean $boolean
+ * @return bool $boolean
*/
public function getUseConsoleRequest()
{
@@ -99,12 +98,12 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Set the usage of the console router or not
- * @param boolean $boolean
+ * @param bool $boolean
* @return AbstractControllerTestCase
*/
public function setUseConsoleRequest($boolean)
{
- $this->useConsoleRequest = (boolean) $boolean;
+ $this->useConsoleRequest = (bool) $boolean;
return $this;
}
@@ -213,15 +212,19 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
}
if ($method == HttpRequest::METHOD_POST) {
- $post = $params;
+ if (count($params) != 0){
+ $post = $params;
+ }
} elseif ($method == HttpRequest::METHOD_GET) {
$query = array_merge($query, $params);
} elseif ($method == HttpRequest::METHOD_PUT) {
- array_walk($params,
- function(&$item, $key) { $item = $key . '=' . $item; }
- );
- $content = implode('&', $params);
- $request->setContent($content);
+ if (count($params) != 0){
+ array_walk($params,
+ function(&$item, $key) { $item = $key . '=' . $item; }
+ );
+ $content = implode('&', $params);
+ $request->setContent($content);
+ }
} elseif ($params) {
trigger_error(
'Additional params is only supported by GET, POST and PUT HTTP method',
@@ -249,8 +252,17 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
* @param array|null $params
* @throws \Exception
*/
- public function dispatch($url, $method = HttpRequest::METHOD_GET, $params = array())
+ public function dispatch($url, $method = null, $params = array())
{
+ if ( !isset($method) &&
+ $this->getRequest() instanceof HttpRequest &&
+ $requestMethod = $this->getRequest()->getMethod()
+ ) {
+ $method = $requestMethod;
+ } elseif (!isset($method)) {
+ $method = HttpRequest::METHOD_GET;
+ }
+
$this->url($url, $method, $params);
$this->getApplication()->run();
@@ -282,7 +294,6 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
// reset singleton
StaticEventManager::resetInstance();
- Placeholder\Registry::unsetRegistry();
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
index 0f117bd5268141d82cd82d89185db5ff56c06fda..af04c8c1b7cff0c3ed6b233570580cdb70555746 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
@@ -15,7 +15,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
{
/**
* HTTP controller must not use the console request
- * @var boolean
+ * @var bool
*/
protected $useConsoleRequest = false;
@@ -137,7 +137,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$header, $pattern, $responseHeader->getFieldValue()
));
}
- $this->assertTrue((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+ $this->assertTrue((bool) preg_match($pattern, $responseHeader->getFieldValue()));
}
/**
@@ -160,7 +160,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$header, $pattern
));
}
- $this->assertFalse((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+ $this->assertFalse((bool) preg_match($pattern, $responseHeader->getFieldValue()));
}
/**
@@ -254,7 +254,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$pattern, $responseHeader->getFieldValue()
));
}
- $this->assertTrue((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+ $this->assertTrue((bool) preg_match($pattern, $responseHeader->getFieldValue()));
}
/**
@@ -275,7 +275,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
'Failed asserting response DOES NOT redirect to URL MATCHING "%s"', $pattern
));
}
- $this->assertFalse((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+ $this->assertFalse((bool) preg_match($pattern, $responseHeader->getFieldValue()));
}
/**
@@ -292,7 +292,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
* Execute a DOM/XPath query
*
* @param string $path
- * @param boolean $useXpath
+ * @param bool $useXpath
* @return array
*/
private function query($path, $useXpath = false)
@@ -321,7 +321,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
* Count the dom query executed
*
* @param string $path
- * @return integer
+ * @return int
*/
private function queryCount($path)
{
@@ -332,7 +332,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
* Count the dom query executed
*
* @param string $path
- * @return integer
+ * @return int
*/
private function xpathQueryCount($path)
{
@@ -343,7 +343,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
* Assert against DOM/XPath selection
*
* @param string $path
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function queryAssertion($path, $useXpath = false)
{
@@ -381,7 +381,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
* Assert against DOM/XPath selection
*
* @param string $path CSS selector path
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function notQueryAssertion($path, $useXpath = false)
{
@@ -420,7 +420,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $count Number of nodes that should match
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function queryCountAssertion($path, $count, $useXpath = false)
{
@@ -462,7 +462,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $count Number of nodes that should NOT match
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function notQueryCountAssertion($path, $count, $useXpath = false)
{
@@ -504,7 +504,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $count Minimum number of nodes that should match
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function queryCountMinAssertion($path, $count, $useXpath = false)
{
@@ -546,7 +546,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $count Maximum number of nodes that should match
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function queryCountMaxAssertion($path, $count, $useXpath = false)
{
@@ -588,7 +588,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $match content that should be contained in matched nodes
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function queryContentContainsAssertion($path, $match, $useXpath = false)
{
@@ -634,7 +634,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $match content that should NOT be contained in matched nodes
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function notQueryContentContainsAssertion($path, $match, $useXpath = false)
{
@@ -680,7 +680,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $pattern Pattern that should be contained in matched nodes
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function queryContentRegexAssertion($path, $pattern, $useXpath = false)
{
@@ -696,7 +696,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$path, $pattern, $result->current()->nodeValue
));
}
- $this->assertTrue((boolean) preg_match($pattern, $result->current()->nodeValue));
+ $this->assertTrue((bool) preg_match($pattern, $result->current()->nodeValue));
}
/**
@@ -726,7 +726,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path CSS selector path
* @param string $pattern pattern that should NOT be contained in matched nodes
- * @param boolean $useXpath
+ * @param bool $useXpath
*/
private function notQueryContentRegexAssertion($path, $pattern, $useXpath = false)
{
@@ -742,7 +742,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$path, $pattern
));
}
- $this->assertFalse((boolean) preg_match($pattern, $result->current()->nodeValue));
+ $this->assertFalse((bool) preg_match($pattern, $result->current()->nodeValue));
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php b/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..010a0d25eadc98772ba702559d0a171385ff8d43
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+namespace Zend\Test\Util;
+
+use Zend\Mvc\Service;
+use Zend\ServiceManager\ServiceManager;
+
+class ModuleLoader
+{
+ /**
+ * @var ServiceManager
+ */
+ protected $serviceManager;
+
+ /**
+ * Load list of modules or application configuration
+ *
+ * @param array $configuration
+ */
+ public function __construct(array $configuration)
+ {
+ if (!isset($configuration['modules'])) {
+ $modules = $configuration;
+ $configuration = array(
+ 'module_listener_options' => array(
+ 'module_paths' => array(),
+ ),
+ 'modules' => array(),
+ );
+ foreach ($modules as $key => $module) {
+ if (is_numeric($key)) {
+ $configuration['modules'][] = $module;
+ continue;
+ }
+ $configuration['modules'][] = $key;
+ $configuration['module_listener_options']['module_paths'][$key] = $module;
+ }
+ }
+
+ $smConfig = isset($configuration['service_manager']) ? $configuration['service_manager'] : array();
+ $this->serviceManager = new ServiceManager(new Service\ServiceManagerConfig($smConfig));
+ $this->serviceManager->setService('ApplicationConfig', $configuration);
+ $this->serviceManager->get('ModuleManager')->loadModules();
+ }
+
+ /**
+ * Get the application
+ *
+ * @return Zend\Mvc\Application
+ */
+ public function getApplication()
+ {
+ return $this->getServiceManager()->get('Application');
+ }
+
+ /**
+ * Get the module manager
+ *
+ * @return Zend\ModuleManager\ModuleManager
+ */
+ public function getModuleManager()
+ {
+ return $this->getServiceManager()->get('ModuleManager');
+ }
+
+ /**
+ * Get module
+ *
+ * @return mixed
+ */
+ public function getModule($moduleName)
+ {
+ return $this->getModuleManager()->getModule($moduleName);
+ }
+
+ /**
+ * Get the service manager
+ *
+ * @var ServiceManager
+ */
+ public function getServiceManager()
+ {
+ return $this->serviceManager;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/composer.json b/vendor/zendframework/zendframework/library/Zend/Test/composer.json
index 3b6e386f6ae2a84389bd3a2f6bdce3c30116b707..926f12ba8f9109aeb1dc25116d13d097e08e9647 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Test/composer.json
@@ -26,8 +26,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
index 38dca3470dcca88b29e31b5fa48b064c7f286e6e..98ed636dd3a5149cbd6be34c7ea503b7c8f0bf15 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
@@ -88,7 +88,7 @@ class Figlet
/**
* Output width, defaults to 80.
*
- * @var integer
+ * @var int
*/
protected $outputWidth = 80;
@@ -102,35 +102,35 @@ class Figlet
/**
* Height of the characters
*
- * @var integer
+ * @var int
*/
protected $charHeight;
/**
* Max length of any character
*
- * @var integer
+ * @var int
*/
protected $maxLength;
/**
* Smush mode
*
- * @var integer
+ * @var int
*/
protected $smushMode = 0;
/**
* Smush defined by the font
*
- * @var integer
+ * @var int
*/
protected $fontSmush = 0;
/**
* Smush defined by the user
*
- * @var integer
+ * @var int
*/
protected $userSmush = 0;
@@ -147,7 +147,7 @@ class Figlet
* For using font default, this parameter should be null, else one of
* the values of Zend\Text\Figlet::JUSTIFICATION_*
*
- * @var integer
+ * @var int
*/
protected $justification = null;
@@ -157,14 +157,14 @@ class Figlet
* For using font default, this parameter should be null, else one of
* the values of Zend\Text\Figlet::DIRECTION_*
*
- * @var integer
+ * @var int
*/
protected $rightToLeft = null;
/**
* Override font file smush layout
*
- * @var integer
+ * @var int
*/
protected $smushOverride = 0;
@@ -178,28 +178,28 @@ class Figlet
/**
* Previous character width
*
- * @var integer
+ * @var int
*/
protected $previousCharWidth = 0;
/**
* Current character width
*
- * @var integer
+ * @var int
*/
protected $currentCharWidth = 0;
/**
* Current outline length
*
- * @var integer
+ * @var int
*/
protected $outlineLength = 0;
/**
* Maximum outline length
*
- * @var integer
+ * @var int
*/
protected $outlineLengthLimit = 0;
@@ -213,14 +213,14 @@ class Figlet
/**
* In character line length
*
- * @var integer
+ * @var int
*/
protected $inCharLineLength = 0;
/**
* Maximum in character line length
*
- * @var integer
+ * @var int
*/
protected $inCharLineLengthLimit = 0;
@@ -328,7 +328,7 @@ class Figlet
* Set the justification. 0 stands for left aligned, 1 for centered and 2
* for right aligned.
*
- * @param integer $justification Justification of the output text
+ * @param int $justification Justification of the output text
* @return Figlet
*/
public function setJustification($justification)
@@ -340,7 +340,7 @@ class Figlet
/**
* Set the output width
*
- * @param integer $outputWidth Output with which should be used for word
+ * @param int $outputWidth Output with which should be used for word
* wrapping and justification
* @return Figlet
*/
@@ -355,7 +355,7 @@ class Figlet
* Zend\Text\Figlet::DIRECTION_LEFT_TO_RIGHT. For writing from right to left,
* use Zend\Text\Figlet::DIRECTION_RIGHT_TO_LEFT.
*
- * @param integer $rightToLeft Right-to-left mode
+ * @param int $rightToLeft Right-to-left mode
* @return Figlet
*/
public function setRightToLeft($rightToLeft)
@@ -369,7 +369,7 @@ class Figlet
*
* Use one of the constants of Zend\Text\Figlet::SM_*, you may combine them.
*
- * @param integer $smushMode Smush mode to use for generating text
+ * @param int $smushMode Smush mode to use for generating text
* @return Figlet
*/
public function setSmushMode($smushMode)
@@ -710,7 +710,7 @@ class Figlet
* Returns the maximum amount that the current character can be smushed into
* the current line.
*
- * @return integer
+ * @return int
*/
protected function _smushAmount()
{
@@ -1185,7 +1185,7 @@ class Figlet
* Unicode compatible ord() method
*
* @param string $c The char to get the value from
- * @return integer
+ * @return int
*/
protected function _uniOrd($c)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php b/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php
index 223982be0496035f0b07f39af0f6b91be43ad5c5..d82e3aa1f430142f6a44392fc651a536d3d9e424 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php
@@ -20,7 +20,7 @@ class MultiByte
* Word wrap
*
* @param string $string
- * @param integer $width
+ * @param int $width
* @param string $break
* @param bool $cut
* @param string $charset
@@ -46,9 +46,9 @@ class MultiByte
* String padding
*
* @param string $input
- * @param integer $padLength
+ * @param int $padLength
* @param string $padString
- * @param integer $padType
+ * @param int $padType
* @param string $charset
* @return string
* @deprecated Please use Zend\Stdlib\StringUtils instead
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php
index f8154982481ddb9ed7420f8c989efc7ceb07e546..833b9377c4db47efa36c55e9cfe5bc9c4e79906b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php
@@ -41,7 +41,7 @@ class Column
/**
* Colspan of the column
*
- * @var integer
+ * @var int
*/
protected $colSpan = 1;
@@ -57,7 +57,7 @@ class Column
*
* @param string $content The content of the column
* @param string $align The align of the content
- * @param integer $colSpan The colspan of the column
+ * @param int $colSpan The colspan of the column
* @param string $charset The encoding of the content
*/
public function __construct($content = null, $align = null, $colSpan = null, $charset = null)
@@ -154,7 +154,7 @@ class Column
/**
* Get the colspan
*
- * @return integer
+ * @return int
*/
public function getColSpan()
{
@@ -164,8 +164,8 @@ class Column
/**
* Render the column width the given column width
*
- * @param integer $columnWidth The width of the column
- * @param integer $padding The padding for the column
+ * @param int $columnWidth The width of the column
+ * @param int $padding The padding for the column
* @throws Exception\InvalidArgumentException When $columnWidth is lower than 1
* @throws Exception\OutOfBoundsException When padding is greater than columnWidth
* @return string
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php
index b6a92a802e31079a23f62eaf3c4faeec448399f0..93e4d6e7e348910a8f08b85684e1bc9a7b534f77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php
@@ -129,7 +129,7 @@ class Unicode implements Decorator
/**
* Convert am unicode character code to a character
*
- * @param integer $code
+ * @param int $code
* @return string|false
*/
protected function _uniChar($code)
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php
index fd8a317f6c879c6e2681db5c3161d5580838761d..ee3fa5f7c5f56a4ff643b95ab125b4e2cf380baf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php
@@ -72,7 +72,7 @@ class Row
*
* Returns null, when the index is out of range
*
- * @param integer $index
+ * @param int $index
* @return Column|null
*/
public function getColumn($index)
@@ -98,7 +98,7 @@ class Row
* Get the widths of all columns, which were rendered last
*
* @throws Exception\UnexpectedValueException When no columns were rendered yet
- * @return integer
+ * @return int
*/
public function getColumnWidths()
{
@@ -114,7 +114,7 @@ class Row
*
* @param array $columnWidths Width of all columns
* @param Decorator $decorator Decorator for the row borders
- * @param integer $padding Padding for the columns
+ * @param int $padding Padding for the columns
* @throws Exception\OverflowException When there are too many columns
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
index 5560893afc7cde85b6c8423333611503dee4dac7..99bf5318dec72dd718f658528ae74d9ffe127a6b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
@@ -50,14 +50,14 @@ class Table
/**
* Auto separation mode
*
- * @var integer
+ * @var int
*/
protected $autoSeparate = self::AUTO_SEPARATE_ALL;
/**
* Padding for columns
*
- * @var integer
+ * @var int
*/
protected $padding = 0;
@@ -177,7 +177,7 @@ class Table
/**
* Set auto separation mode
*
- * @param integer $autoSeparate Auto separation mode
+ * @param int $autoSeparate Auto separation mode
* @return Table
*/
public function setAutoSeparate($autoSeparate)
@@ -206,7 +206,7 @@ class Table
/**
* Set the column padding
*
- * @param integer $padding The padding for the columns
+ * @param int $padding The padding for the columns
* @return Table
*/
public function setPadding($padding)
@@ -245,7 +245,7 @@ class Table
/**
* Set default column align for rows created by appendRow(array $data)
*
- * @param integer $columnNum
+ * @param int $columnNum
* @param string $align
* @return Table
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/composer.json b/vendor/zendframework/zendframework/library/Zend/Text/composer.json
index 21b77a2bc21ee92a70beafd862b37984221b685d..ce4c7ed8940885e5baedad2d173d7160acca00f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Text/composer.json
@@ -19,8 +19,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php
index 28fd8696b2a73879a0493eb578190c6fe12d0925..1d093a6907f4520dc98ad7ff6497cf40fe8747be 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php
@@ -14,7 +14,7 @@ class InvalidUriPartException extends InvalidArgumentException
/**
* Part-specific error codes
*
- * @var integer
+ * @var int
*/
const INVALID_SCHEME = 1;
const INVALID_USER = 2;
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Http.php b/vendor/zendframework/zendframework/library/Zend/Uri/Http.php
index 40bd88aafef2ced390cc672711f3792a1aca086b..fe0d3d8ad5d3d1c9459208487bf011e9dd98927a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Http.php
@@ -122,7 +122,7 @@ class Http extends Uri
* default. Users may still enforce allowing other host types.
*
* @param string $host
- * @param integer $allowed
+ * @param int $allowed
* @return bool
*/
public static function validateHost($host, $allowed = self::HOST_DNS_OR_IPV4_OR_IPV6)
@@ -162,7 +162,7 @@ class Http extends Uri
*
* If no port is set, will return the default port according to the scheme
*
- * @return integer
+ * @return int
* @see Zend\Uri\Uri::getPort()
*/
public function getPort()
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php b/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php
index 6e12c3f9cf6f02c115cda3b74aa5fc2fbe0bf297..32e7be5fc303c3bca87606fa7705a6e247aa58ad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php
@@ -69,7 +69,7 @@ class Uri implements UriInterface
/**
* URI port
*
- * @var integer
+ * @var int
*/
protected $port;
@@ -97,7 +97,7 @@ class Uri implements UriInterface
/**
* Which host part types are valid for this URI?
*
- * @var integer
+ * @var int
*/
protected $validHostTypes = self::HOST_ALL;
@@ -253,6 +253,20 @@ class Uri implements UriInterface
return ($this->scheme !== null);
}
+ /**
+ * Reset URI parts
+ */
+ protected function reset()
+ {
+ $this->setScheme(null);
+ $this->setPort(null);
+ $this->setUserInfo(null);
+ $this->setHost(null);
+ $this->setPath(null);
+ $this->setFragment(null);
+ $this->setQuery(null);
+ }
+
/**
* Parse a URI string
*
@@ -261,6 +275,8 @@ class Uri implements UriInterface
*/
public function parse($uri)
{
+ $this->reset();
+
// Capture scheme
if (($scheme = self::parseScheme($uri)) !== null) {
$this->setScheme($scheme);
@@ -601,7 +617,7 @@ class Uri implements UriInterface
/**
* Get the URI port
*
- * @return integer|null
+ * @return int|null
*/
public function getPort()
{
@@ -737,7 +753,7 @@ class Uri implements UriInterface
/**
* Set the port part of the URI
*
- * @param integer $port
+ * @param int $port
* @return Uri
*/
public function setPort($port)
@@ -859,7 +875,7 @@ class Uri implements UriInterface
* from what is commonly accepted as valid HTTP URLs for example.
*
* @param string $host
- * @param integer $allowed bitmask of allowed host types
+ * @param int $allowed bitmask of allowed host types
* @return bool
*/
public static function validateHost($host, $allowed = self::HOST_ALL)
@@ -895,7 +911,7 @@ class Uri implements UriInterface
*
* Valid values include numbers between 1 and 65535, and empty values
*
- * @param integer $port
+ * @param int $port
* @return bool
*/
public static function validatePort($port)
@@ -1139,7 +1155,7 @@ class Uri implements UriInterface
* Check if a host name is a valid IP address, depending on allowed IP address types
*
* @param string $host
- * @param integer $allowed allowed address types
+ * @param int $allowed allowed address types
* @return bool
*/
protected static function isValidIpAddress($host, $allowed)
@@ -1237,9 +1253,9 @@ class Uri implements UriInterface
* If the class defines a default port for the current scheme, and the
* current port is default, it will be unset.
*
- * @param integer $port
+ * @param int $port
* @param string $scheme
- * @return integer|null
+ * @return int|null
*/
protected static function normalizePort($port, $scheme = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php b/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
index f0a45356d55598dc4d4de73a45cb597ad26b68c8..2b17079ee79752670b78cfde767468fdaa3e2b5d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
@@ -117,7 +117,7 @@ interface UriInterface
/**
* Get the URI port
*
- * @return integer|null
+ * @return int|null
*/
public function getPort();
@@ -202,7 +202,7 @@ interface UriInterface
/**
* Set the port part of the URI
*
- * @param integer $port
+ * @param int $port
* @return Uri
*/
public function setPort($port);
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/composer.json b/vendor/zendframework/zendframework/library/Zend/Uri/composer.json
index a9bbcd4e5bda17e0f3e6ca215afe48ca8af458bb..57420246ced0f4e339e96dd74efd5f584c9a9a78 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/composer.json
@@ -19,8 +19,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php b/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php
index 62e1edf6be8ef234940986102666813ee6c7c0ac..7aa2dfe55dc279d824939a04a9b32edbab2f684c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php
@@ -10,13 +10,10 @@
namespace Zend\Validator;
use Traversable;
-use Zend\I18n\Translator\Translator;
-use Zend\I18n\Translator\TranslatorAwareInterface;
use Zend\Stdlib\ArrayUtils;
-use Zend\Validator\Exception\InvalidArgumentException;
abstract class AbstractValidator implements
- TranslatorAwareInterface,
+ Translator\TranslatorAwareInterface,
ValidatorInterface
{
/**
@@ -28,7 +25,7 @@ abstract class AbstractValidator implements
/**
* Default translation object for all validate objects
- * @var Translator
+ * @var Translator\TranslatorInterface
*/
protected static $defaultTranslator;
@@ -41,7 +38,7 @@ abstract class AbstractValidator implements
/**
* Limits the maximum returned length of a error message
*
- * @var Integer
+ * @var int
*/
protected static $messageLength = -1;
@@ -49,7 +46,7 @@ abstract class AbstractValidator implements
'messages' => array(), // Array of validation failure messages
'messageTemplates' => array(), // Array of validation failure message templates
'messageVariables' => array(), // Array of additional variables available for validation failure messages
- 'translator' => null, // Translation object to used -> Zend\I18n\Translator\Translator
+ 'translator' => null, // Translation object to used -> Translator\TranslatorInterface
'translatorTextDomain' => null, // Translation text domain
'translatorEnabled' => true, // Is translation enabled?
'valueObscured' => false, // Flag indicating whether or not value should be obfuscated
@@ -103,7 +100,7 @@ abstract class AbstractValidator implements
return $this->options[$option];
}
- throw new InvalidArgumentException("Invalid option '$option'");
+ throw new Exception\InvalidArgumentException("Invalid option '$option'");
}
/**
@@ -159,7 +156,7 @@ abstract class AbstractValidator implements
*/
public function getMessages()
{
- return $this->abstractOptions['messages'];
+ return array_unique($this->abstractOptions['messages']);
}
/**
@@ -212,7 +209,7 @@ abstract class AbstractValidator implements
}
if (!isset($this->abstractOptions['messageTemplates'][$messageKey])) {
- throw new InvalidArgumentException("No message template exists for key '$messageKey'");
+ throw new Exception\InvalidArgumentException("No message template exists for key '$messageKey'");
}
$this->abstractOptions['messageTemplates'][$messageKey] = $messageString;
@@ -268,7 +265,7 @@ abstract class AbstractValidator implements
return $result;
}
- throw new InvalidArgumentException("No property exists by the name '$property'");
+ throw new Exception\InvalidArgumentException("No property exists by the name '$property'");
}
/**
@@ -395,12 +392,12 @@ abstract class AbstractValidator implements
/**
* Set translation object
*
- * @param Translator|null $translator
+ * @param Translator\TranslatorInterface|null $translator
* @param string $textDomain (optional)
* @return AbstractValidator
* @throws Exception\InvalidArgumentException
*/
- public function setTranslator(Translator $translator = null, $textDomain = null)
+ public function setTranslator(Translator\TranslatorInterface $translator = null, $textDomain = null)
{
$this->abstractOptions['translator'] = $translator;
if (null !== $textDomain) {
@@ -412,7 +409,7 @@ abstract class AbstractValidator implements
/**
* Return translation object
*
- * @return Translator|null
+ * @return Translator\TranslatorInterface|null
*/
public function getTranslator()
{
@@ -466,13 +463,13 @@ abstract class AbstractValidator implements
/**
* Set default translation object for all validate objects
*
- * @param Translator|null $translator
+ * @param Translator\TranslatorInterface|null $translator
* @param string $textDomain (optional)
* @return void
* @throws Exception\InvalidArgumentException
*/
public static function setDefaultTranslator(
- Translator $translator = null, $textDomain = null
+ Translator\TranslatorInterface $translator = null, $textDomain = null
)
{
static::$defaultTranslator = $translator;
@@ -484,7 +481,7 @@ abstract class AbstractValidator implements
/**
* Get default translation object for all validate objects
*
- * @return Translator|null
+ * @return Translator\TranslatorInterface|null
*/
public static function getDefaultTranslator()
{
@@ -547,7 +544,7 @@ abstract class AbstractValidator implements
/**
* Returns the maximum allowed message length
*
- * @return integer
+ * @return int
*/
public static function getMessageLength()
{
@@ -557,7 +554,7 @@ abstract class AbstractValidator implements
/**
* Sets the maximum allowed message length
*
- * @param integer $length
+ * @param int $length
*/
public static function setMessageLength($length = -1)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php
index 0d5a516725a98db90b17e16298ca09d0b448f078..196106c8ea6d62e65ef7df6da00dc0a30e170110 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php
@@ -124,7 +124,7 @@ abstract class AbstractAdapter implements AdapterInterface
/**
* Returns the allowed characters
*
- * @return integer|string|array
+ * @return int|string|array
*/
public function getCharacters()
{
@@ -183,7 +183,7 @@ abstract class AbstractAdapter implements AdapterInterface
/**
* Sets the allowed characters of this barcode
*
- * @param integer $characters
+ * @param int $characters
* @return AbstractAdapter
*/
protected function setCharacters($characters)
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php
index a7fbb8f72fd9de51235b7b823652a7224ebc2d0d..703e5ea45eac5429e8f3c15aff4460f0ad793cfa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php
@@ -45,7 +45,7 @@ interface AdapterInterface
/**
* Returns the allowed characters
*
- * @return integer|string|array
+ * @return int|string|array
*/
public function getCharacters();
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php
index d07213698fbfcf5909aa6b5d934e65ef2af7b00d..1d462295cf6bab0945f92e199e45f21922769c6b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php
@@ -9,9 +9,9 @@
namespace Zend\Validator\Barcode;
-use Zend\Validator\Exception;
use Zend\Stdlib\StringUtils;
use Zend\Stdlib\StringWrapper\StringWrapperInterface;
+use Zend\Validator\Exception;
class Code128 extends AbstractAdapter
{
@@ -345,7 +345,7 @@ class Code128 extends AbstractAdapter
*
* @param string $value
* @param string $set
- * @return integer
+ * @return int
*/
protected function ord128($value, $set)
{
@@ -406,7 +406,7 @@ class Code128 extends AbstractAdapter
* "00" to "99" == 0 to 99
* 132 to 138 == 100 to 106
*
- * @param integer $value
+ * @param int $value
* @param string $set
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php
index ba1ae1d8b50e320588cd41127425b86e9b5474e7..8db7cce8980557d63a23de7db39d04a0bd261d69 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php
@@ -13,7 +13,7 @@ class Identcode extends AbstractAdapter
{
/**
* Allowed barcode lengths
- * @var integer
+ * @var int
*/
protected $length = 12;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php b/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php
index 4d55e0b90e06fdc2df3e73ce2979834176c3a5f6..8dd346175671ed8f39f9e0f04f8d4ec790b559c0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php
@@ -110,7 +110,8 @@ class CreditCard extends AbstractValidator
'649', '65'),
self::JCB => array('3528', '3529', '353', '354', '355', '356', '357', '358'),
self::LASER => array('6304', '6706', '6771', '6709'),
- self::MAESTRO => array('5018', '5020', '5038', '6304', '6759', '6761', '6763'),
+ self::MAESTRO => array('5018', '5020', '5038', '6304', '6759', '6761', '6762', '6763',
+ '6764', '6765', '6766'),
self::MASTERCARD => array('51', '52', '53', '54', '55'),
self::SOLO => array('6334', '6767'),
self::UNIONPAY => array('622126', '622127', '622128', '622129', '62213', '62214',
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php b/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php
index be3f79addb44c2860af5b8ff7f9b99f12348cb44..50b51b853dfa0fc208decc36ea2190d8d79dac26 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php
@@ -270,7 +270,7 @@ class Csrf extends AbstractValidator
protected function initCsrfToken()
{
$session = $this->getSession();
- //$session->setExpirationHops(1, null, true);
+ //$session->setExpirationHops(1, null);
$timeout = $this->getTimeout();
if (null !== $timeout) {
$session->setExpirationSeconds($timeout);
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php b/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php
index e5b21679c840e73a8d3e17147b447f7ad432e262..a85a58756c0fd786b71a67a78f8568455c63f48e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php
@@ -30,7 +30,7 @@ class DateStep extends Date
/**
* Optional base date value
*
- * @var string|integer|\DateTime
+ * @var string|int|\DateTime
*/
protected $baseValue = '1970-01-01T00:00:00Z';
@@ -105,7 +105,7 @@ class DateStep extends Date
/**
* Sets the base value from which the step should be computed
*
- * @param string|integer|\DateTime $baseValue
+ * @param string|int|\DateTime $baseValue
* @return DateStep
*/
public function setBaseValue($baseValue)
@@ -117,7 +117,7 @@ class DateStep extends Date
/**
* Returns the base value from which the step should be computed
*
- * @return string|integer|\DateTime
+ * @return string|int|\DateTime
*/
public function getBaseValue()
{
@@ -171,7 +171,7 @@ class DateStep extends Date
/**
* Converts an int or string to a DateTime object
*
- * @param string|integer|\DateTime $param
+ * @param string|int|\DateTime $param
* @return \DateTime
* @throws Exception\InvalidArgumentException
*/
@@ -204,7 +204,7 @@ class DateStep extends Date
/**
* Returns true if a date is within a valid step
*
- * @param string|integer|\DateTime $value
+ * @param string|int|\DateTime $value
* @return bool
* @throws Exception\InvalidArgumentException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php b/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php
index 5e94df15d817430b99d323cb1f4d0224773875c1..aeab82a98ce9385f1ec6afa1f88aa6f30e1b4625 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php
@@ -12,8 +12,8 @@ namespace Zend\Validator\Db;
use Traversable;
use Zend\Db\Adapter\Adapter as DbAdapter;
use Zend\Db\Adapter\Driver\DriverInterface as DbDriverInterface;
-use Zend\Db\Sql\Sql;
use Zend\Db\Sql\Select;
+use Zend\Db\Sql\Sql;
use Zend\Db\Sql\TableIdentifier;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php b/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
index 96e36803409df27cfeb3275c12b608626d7a0d35..e362fbdfe0a4f724a367b5ce15424bc1b8448c21 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
@@ -157,7 +157,7 @@ class EmailAddress extends AbstractValidator
/**
* Returns the allow option of the attached hostname validator
*
- * @return integer
+ * @return int
*/
public function getAllow()
{
@@ -167,7 +167,7 @@ class EmailAddress extends AbstractValidator
/**
* Sets the allow option of the hostname validator to use
*
- * @param integer $allow
+ * @param int $allow
* @return EmailAddress Provides a fluent interface
*/
public function setAllow($allow)
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php
index e8a80499d03743e9b13919da6c6d5f27da9ce397..ffa691a8d7828fb05cfd76109ee5c75d5bfee8be 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php
@@ -12,10 +12,12 @@ namespace Zend\Validator;
use Traversable;
use Zend\Stdlib\ArrayUtils;
-class Explode extends AbstractValidator
+class Explode extends AbstractValidator implements ValidatorPluginManagerAwareInterface
{
const INVALID = 'explodeInvalid';
+ protected $pluginManager;
+
/**
* @var array
*/
@@ -65,14 +67,56 @@ class Explode extends AbstractValidator
return $this->valueDelimiter;
}
+ /**
+ * Set validator plugin manager
+ *
+ * @param ValidatorPluginManager $pluginManager
+ */
+ public function setValidatorPluginManager(ValidatorPluginManager $pluginManager)
+ {
+ $this->pluginManager = $pluginManager;
+ }
+
+ /**
+ * Get validator plugin manager
+ *
+ * @return ValidatorPluginManager
+ */
+ public function getValidatorPluginManager()
+ {
+ if (!$this->pluginManager) {
+ $this->setValidatorPluginManager(new ValidatorPluginManager());
+ }
+
+ return $this->pluginManager;
+ }
+
/**
* Sets the Validator for validating each value
*
- * @param ValidatorInterface $validator
+ * @param ValidatorInterface|array $validator
+ * @throws Exception\RuntimeException
* @return Explode
*/
- public function setValidator(ValidatorInterface $validator)
+ public function setValidator($validator)
{
+ if (is_array($validator)) {
+ if (!isset($validator['name'])) {
+ throw new Exception\RuntimeException(
+ 'Invalid validator specification provided; does not include "name" key'
+ );
+ }
+ $name = $validator['name'];
+ $options = isset($validator['options']) ? $validator['options'] : array();
+ $validator = $this->getValidatorPluginManager()->get($name, $options);
+ }
+
+ if (!$validator instanceof ValidatorInterface) {
+ throw new Exception\RuntimeException(
+ 'Invalid validator given'
+ );
+ }
+
$this->validator = $validator;
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php
index 26a48edf25935e9b7b5f2d39953cd289e4fc320a..4cb5202636d8b4f7362c5224c101bda3940a7c93 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php
@@ -45,7 +45,7 @@ class Count extends AbstractValidator
/**
* Actual filecount
*
- * @var integer
+ * @var int
*/
protected $count;
@@ -76,7 +76,7 @@ class Count extends AbstractValidator
* 'min': Minimum filecount
* 'max': Maximum filecount
*
- * @param integer|array|\Traversable $options Options for the adapter
+ * @param int|array|\Traversable $options Options for the adapter
*/
public function __construct($options = null)
{
@@ -95,7 +95,7 @@ class Count extends AbstractValidator
/**
* Returns the minimum file count
*
- * @return integer
+ * @return int
*/
public function getMin()
{
@@ -105,7 +105,7 @@ class Count extends AbstractValidator
/**
* Sets the minimum file count
*
- * @param integer|array $min The minimum file count
+ * @param int|array $min The minimum file count
* @return Count Provides a fluent interface
* @throws Exception\InvalidArgumentException When min is greater than max
*/
@@ -119,7 +119,7 @@ class Count extends AbstractValidator
throw new Exception\InvalidArgumentException('Invalid options to validator provided');
}
- $min = (integer) $min;
+ $min = (int) $min;
if (($this->getMax() !== null) && ($min > $this->getMax())) {
throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum file count, but $min >"
. " {$this->getMax()}");
@@ -132,7 +132,7 @@ class Count extends AbstractValidator
/**
* Returns the maximum file count
*
- * @return integer
+ * @return int
*/
public function getMax()
{
@@ -142,7 +142,7 @@ class Count extends AbstractValidator
/**
* Sets the maximum file count
*
- * @param integer|array $max The maximum file count
+ * @param int|array $max The maximum file count
* @return Count Provides a fluent interface
* @throws Exception\InvalidArgumentException When max is smaller than min
*/
@@ -156,7 +156,7 @@ class Count extends AbstractValidator
throw new Exception\InvalidArgumentException('Invalid options to validator provided');
}
- $max = (integer) $max;
+ $max = (int) $max;
if (($this->getMin() !== null) && ($max < $this->getMin())) {
throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum file count, but "
. "$max < {$this->getMin()}");
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php
index 2d2477455ecef8ce03aca6ec86dea604881a8dc8..176d9488036a33a9548027574744ca9ea4b26c3e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php
@@ -75,19 +75,13 @@ class ExcludeMimeType extends MimeType
}
}
- if (empty($this->type) &&
- (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))
- ) {
- $this->type = mime_content_type($file);
- }
-
if (empty($this->type) && $this->getHeaderCheck()) {
$this->type = $filetype;
}
if (empty($this->type)) {
$this->error(self::NOT_DETECTED);
- false;
+ return false;
}
$mimetype = $this->getMimeType(true);
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php
index 84e39145f95d6f552d19b072a65f91435a372f6b..30862fe88cd08d31cf6ba6a2776ab2fd07906068 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php
@@ -49,7 +49,7 @@ class FilesSize extends Size
* Min limits the used disk space for all files, when used with max=null it is the maximum file size
* It also accepts an array with the keys 'min' and 'max'
*
- * @param integer|array|Traversable $options Options for this validator
+ * @param int|array|Traversable $options Options for this validator
* @throws \Zend\Validator\Exception\InvalidArgumentException
*/
public function __construct($options = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php
index 7788434e52c84d3c11ce4f8ad44c216ac322a617..ad92e627caaf550955a03dbe57c2c0d46c37ab21 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php
@@ -55,14 +55,14 @@ class ImageSize extends AbstractValidator
/**
* Detected width
*
- * @var integer
+ * @var int
*/
protected $width;
/**
* Detected height
*
- * @var integer
+ * @var int
*/
protected $height;
@@ -113,7 +113,7 @@ class ImageSize extends AbstractValidator
/**
* Returns the minimum allowed width
*
- * @return integer
+ * @return int
*/
public function getMinWidth()
{
@@ -123,7 +123,7 @@ class ImageSize extends AbstractValidator
/**
* Sets the minimum allowed width
*
- * @param integer $minWidth
+ * @param int $minWidth
* @return ImageSize Provides a fluid interface
* @throws Exception\InvalidArgumentException When minwidth is greater than maxwidth
*/
@@ -141,7 +141,7 @@ class ImageSize extends AbstractValidator
/**
* Returns the maximum allowed width
*
- * @return integer
+ * @return int
*/
public function getMaxWidth()
{
@@ -151,7 +151,7 @@ class ImageSize extends AbstractValidator
/**
* Sets the maximum allowed width
*
- * @param integer $maxWidth
+ * @param int $maxWidth
* @return ImageSize Provides a fluid interface
* @throws Exception\InvalidArgumentException When maxwidth is less than minwidth
*/
@@ -169,7 +169,7 @@ class ImageSize extends AbstractValidator
/**
* Returns the minimum allowed height
*
- * @return integer
+ * @return int
*/
public function getMinHeight()
{
@@ -179,7 +179,7 @@ class ImageSize extends AbstractValidator
/**
* Sets the minimum allowed height
*
- * @param integer $minHeight
+ * @param int $minHeight
* @return ImageSize Provides a fluid interface
* @throws Exception\InvalidArgumentException When minheight is greater than maxheight
*/
@@ -197,7 +197,7 @@ class ImageSize extends AbstractValidator
/**
* Returns the maximum allowed height
*
- * @return integer
+ * @return int
*/
public function getMaxHeight()
{
@@ -207,7 +207,7 @@ class ImageSize extends AbstractValidator
/**
* Sets the maximum allowed height
*
- * @param integer $maxHeight
+ * @param int $maxHeight
* @return ImageSize Provides a fluid interface
* @throws Exception\InvalidArgumentException When maxheight is less than minheight
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php
index d80af4e72e93ab4fffffbaa3f2b302b9f0b434f9..624b919233fba030b338ab0a8d55fa833e23b4bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php
@@ -71,6 +71,7 @@ class IsCompressed extends MimeType
'application/x-stuffit',
'application/x-tar',
'application/zip',
+ 'application/x-zip',
'application/zoo',
'multipart/x-gzip',
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
index b52bc78f982fbd4ad4ab01ed906912ddfc87858a..240d426d5bd32d9b67367e876c1c633280c325d1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
@@ -393,11 +393,6 @@ class MimeType extends AbstractValidator
}
}
- if (empty($this->type) &&
- (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) {
- $this->type = mime_content_type($file);
- }
-
if (empty($this->type) && $this->getHeaderCheck()) {
$this->type = $filetype;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php
index eca157df657832618f071ed9a498a7567370eadb..4cf9e20fa2fa2f230ee58d3719f1e031741aacb7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php
@@ -46,7 +46,7 @@ class Size extends AbstractValidator
/**
* Detected size
*
- * @var integer
+ * @var int
*/
protected $size;
@@ -70,7 +70,7 @@ class Size extends AbstractValidator
* 'max': Maximum file size
* 'useByteString': Use bytestring or real size for messages
*
- * @param integer|array|\Traversable $options Options for the adapter
+ * @param int|array|\Traversable $options Options for the adapter
*/
public function __construct($options = null)
{
@@ -94,7 +94,7 @@ class Size extends AbstractValidator
* Should messages return bytes as integer or as string in SI notation
*
* @param bool $byteString Use bytestring ?
- * @return integer
+ * @return int
*/
public function useByteString($byteString = true)
{
@@ -116,7 +116,7 @@ class Size extends AbstractValidator
* Returns the minimum file size
*
* @param bool $raw Whether or not to force return of the raw value (defaults off)
- * @return integer|string
+ * @return int|string
*/
public function getMin($raw = false)
{
@@ -135,7 +135,7 @@ class Size extends AbstractValidator
* This includes 'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'
* For example: 2000, 2MB, 0.2GB
*
- * @param integer|string $min The minimum file size
+ * @param int|string $min The minimum file size
* @return Size Provides a fluent interface
* @throws Exception\InvalidArgumentException When min is greater than max
*/
@@ -145,7 +145,7 @@ class Size extends AbstractValidator
throw new Exception\InvalidArgumentException('Invalid options to validator provided');
}
- $min = (integer) $this->fromByteString($min);
+ $min = (int) $this->fromByteString($min);
$max = $this->getMax(true);
if (($max !== null) && ($min > $max)) {
throw new Exception\InvalidArgumentException(
@@ -161,7 +161,7 @@ class Size extends AbstractValidator
* Returns the maximum file size
*
* @param bool $raw Whether or not to force return of the raw value (defaults off)
- * @return integer|string
+ * @return int|string
*/
public function getMax($raw = false)
{
@@ -180,7 +180,7 @@ class Size extends AbstractValidator
* This includes 'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'
* For example: 2000, 2MB, 0.2GB
*
- * @param integer|string $max The maximum file size
+ * @param int|string $max The maximum file size
* @return Size Provides a fluent interface
* @throws Exception\InvalidArgumentException When max is smaller than min
*/
@@ -190,7 +190,7 @@ class Size extends AbstractValidator
throw new Exception\InvalidArgumentException('Invalid options to validator provided');
}
- $max = (integer) $this->fromByteString($max);
+ $max = (int) $this->fromByteString($max);
$min = $this->getMin(true);
if (($min !== null) && ($max < $min)) {
throw new Exception\InvalidArgumentException(
@@ -302,7 +302,7 @@ class Size extends AbstractValidator
/**
* Returns the formatted size
*
- * @param integer $size
+ * @param int $size
* @return string
*/
protected function toByteString($size)
@@ -319,12 +319,12 @@ class Size extends AbstractValidator
* Returns the unformatted size
*
* @param string $size
- * @return integer
+ * @return int
*/
protected function fromByteString($size)
{
if (is_numeric($size)) {
- return (integer) $size;
+ return (int) $size;
}
$type = trim(substr($size, -2, 1));
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php
index 7f473ae30944508338247319897e4fa3ca1c9675..b40aceeb490ab963b557eb3b61d269fd8f6dc7a5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php
@@ -45,7 +45,7 @@ class WordCount extends AbstractValidator
/**
* Word count
*
- * @var integer
+ * @var int
*/
protected $count;
@@ -70,7 +70,7 @@ class WordCount extends AbstractValidator
* 'min': Minimum word count
* 'max': Maximum word count
*
- * @param integer|array|\Traversable $options Options for the adapter
+ * @param int|array|\Traversable $options Options for the adapter
*/
public function __construct($options = null)
{
@@ -89,7 +89,7 @@ class WordCount extends AbstractValidator
/**
* Returns the minimum word count
*
- * @return integer
+ * @return int
*/
public function getMin()
{
@@ -99,7 +99,7 @@ class WordCount extends AbstractValidator
/**
* Sets the minimum word count
*
- * @param integer|array $min The minimum word count
+ * @param int|array $min The minimum word count
* @return WordCount Provides a fluent interface
* @throws Exception\InvalidArgumentException When min is greater than max
*/
@@ -113,7 +113,7 @@ class WordCount extends AbstractValidator
throw new Exception\InvalidArgumentException('Invalid options to validator provided');
}
- $min = (integer) $min;
+ $min = (int) $min;
if (($this->getMax() !== null) && ($min > $this->getMax())) {
throw new Exception\InvalidArgumentException(
"The minimum must be less than or equal to the maximum word count, but $min >"
@@ -127,7 +127,7 @@ class WordCount extends AbstractValidator
/**
* Returns the maximum word count
*
- * @return integer
+ * @return int
*/
public function getMax()
{
@@ -137,7 +137,7 @@ class WordCount extends AbstractValidator
/**
* Sets the maximum file count
*
- * @param integer|array $max The maximum word count
+ * @param int|array $max The maximum word count
* @return WordCount Provides a fluent interface
* @throws Exception\InvalidArgumentException When max is smaller than min
*/
@@ -151,7 +151,7 @@ class WordCount extends AbstractValidator
throw new Exception\InvalidArgumentException('Invalid options to validator provided');
}
- $max = (integer) $max;
+ $max = (int) $max;
if (($this->getMin() !== null) && ($max < $this->getMin())) {
throw new Exception\InvalidArgumentException(
"The maximum must be greater than or equal to the minimum word count, but "
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
index adb81653a92e5d6fce82b1714cc97d78a9140b0f..9f3cb21a1fc280d81ff080a129abf54561e75d94 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
@@ -304,12 +304,12 @@ class Hostname extends AbstractValidator
);
/**
- * Sets validator options
+ * Sets validator options.
*
- * @param integer $allow OPTIONAL Set what types of hostname to allow (default ALLOW_DNS)
- * @param bool $validateIdn OPTIONAL Set whether IDN domains are validated (default true)
- * @param bool $validateTld OPTIONAL Set whether the TLD element of a hostname is validated (default true)
- * @param Ip $ipValidator OPTIONAL
+ * @param int $allow OPTIONAL Set what types of hostname to allow (default ALLOW_DNS)
+ * @param bool $useIdnCheck OPTIONAL Set whether IDN domains are validated (default true)
+ * @param bool $useTldCheck Set whether the TLD element of a hostname is validated (default true)
+ * @param Ip $ipValidator OPTIONAL
* @see http://www.iana.org/cctld/specifications-policies-cctlds-01apr02.htm Technical Specifications for ccTLDs
*/
public function __construct($options = array())
@@ -366,7 +366,7 @@ class Hostname extends AbstractValidator
/**
* Returns the allow option
*
- * @return integer
+ * @return int
*/
public function getAllow()
{
@@ -376,7 +376,7 @@ class Hostname extends AbstractValidator
/**
* Sets the allow option
*
- * @param integer $allow
+ * @param int $allow
* @return Hostname Provides a fluent interface
*/
public function setAllow($allow)
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php b/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php
index 6fcc8c2aca505e0ae6927b14793239602065062a..58f7ae29174768616418a03e57b0c745ab1ce912 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php
@@ -76,6 +76,7 @@ class Iban extends AbstractValidator
'BE' => 'BE[0-9]{2}[0-9]{3}[0-9]{7}[0-9]{2}',
'BG' => 'BG[0-9]{2}[A-Z]{4}[0-9]{4}[0-9]{2}[A-Z0-9]{8}',
'BH' => 'BH[0-9]{2}[A-Z]{4}[A-Z0-9]{14}',
+ 'BR' => 'BR[0-9]{2}[0-9]{8}[0-9]{5}[0-9]{10}[A-Z][A-Z0-9]',
'CH' => 'CH[0-9]{2}[0-9]{5}[A-Z0-9]{12}',
'CR' => 'CR[0-9]{2}[0-9]{3}[0-9]{14}',
'CY' => 'CY[0-9]{2}[0-9]{3}[0-9]{5}[A-Z0-9]{16}',
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php b/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php
index 743f0aea5f4275c7905a2b04886db912f7ed7380..a43d375246a0f78c32e2deaab3ca35674a79f629 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php
@@ -43,7 +43,8 @@ class Identical extends AbstractValidator
*/
protected $tokenString;
protected $token;
- protected $strict = true;
+ protected $strict = true;
+ protected $literal = false;
/**
* Sets validator options
@@ -61,6 +62,10 @@ class Identical extends AbstractValidator
$this->setStrict($token['strict']);
}
+ if (array_key_exists('literal', $token)) {
+ $this->setLiteral($token['literal']);
+ }
+
$this->setToken($token['token']);
} elseif (null !== $token) {
$this->setToken($token);
@@ -72,7 +77,7 @@ class Identical extends AbstractValidator
/**
* Retrieve token
*
- * @return string
+ * @return mixed
*/
public function getToken()
{
@@ -105,7 +110,7 @@ class Identical extends AbstractValidator
/**
* Sets the strict parameter
*
- * @param Zend\Validator\Identical
+ * @param bool $strict
* @return Identical
*/
public function setStrict($strict)
@@ -114,6 +119,28 @@ class Identical extends AbstractValidator
return $this;
}
+ /**
+ * Returns the literal parameter
+ *
+ * @return bool
+ */
+ public function getLiteral()
+ {
+ return $this->literal;
+ }
+
+ /**
+ * Sets the literal parameter
+ *
+ * @param bool $literal
+ * @return Identical
+ */
+ public function setLiteral($literal)
+ {
+ $this->literal = (bool) $literal;
+ return $this;
+ }
+
/**
* Returns true if and only if a token has been set and the provided value
* matches that token.
@@ -123,23 +150,15 @@ class Identical extends AbstractValidator
* @return bool
* @throws Exception\RuntimeException if the token doesn't exist in the context array
*/
- public function isValid($value, $context = null)
+ public function isValid($value, array $context = null)
{
$this->setValue($value);
$token = $this->getToken();
- if ($context !== null) {
- if (!is_array($context)) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'Context passed to %s must be an array or null; received "%s"',
- __METHOD__,
- (is_object($context) ? get_class($context) : gettype($context))
- ));
- }
-
+ if (!$this->getLiteral() && $context !== null) {
if (is_array($token)) {
- while (is_array($token)){
+ while (is_array($token)) {
$key = key($token);
if (!isset($context[$key])) {
break;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php b/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php
index 44186e1f86b19d8f0e4a79e187c289de9595cd14..e823efd1f4a44bab5d488d37336d7c1ae967aa2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php
@@ -94,7 +94,7 @@ class IsInstanceOf extends AbstractValidator
* Returns true if $value is instance of $this->className
*
* @param mixed $value
- * @return boolean
+ * @return bool
*/
public function isValid($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php b/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php
index 54456f28063f0134d94b1efaade680b97c19cfd1..99da975c8a1c6ca7a61c0d49b55aea5193e35e97 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php
@@ -90,7 +90,7 @@ class NotEmpty extends AbstractValidator
$detected = 0;
$found = false;
foreach ($options as $option) {
- if (in_array($option, $this->constants)) {
+ if (in_array($option, $this->constants, true)) {
$found = true;
$detected += array_search($option, $this->constants);
}
@@ -118,7 +118,7 @@ class NotEmpty extends AbstractValidator
/**
* Set the types
*
- * @param integer|array $type
+ * @param int|array $type
* @throws Exception\InvalidArgumentException
* @return NotEmpty
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php b/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php
index 12c60d8b17558f261ce406ab51a685b95a47edce..64cf646d9a4dfe1b71d96b62204079dd521ea4e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php
@@ -46,7 +46,7 @@ class StringLength extends AbstractValidator
/**
* Sets validator options
*
- * @param integer|array|\Traversable $options
+ * @param int|array|\Traversable $options
*/
public function __construct($options = array())
{
@@ -70,7 +70,7 @@ class StringLength extends AbstractValidator
/**
* Returns the min option
*
- * @return integer
+ * @return int
*/
public function getMin()
{
@@ -80,7 +80,7 @@ class StringLength extends AbstractValidator
/**
* Sets the min option
*
- * @param integer $min
+ * @param int $min
* @throws Exception\InvalidArgumentException
* @return StringLength Provides a fluent interface
*/
@@ -91,14 +91,14 @@ class StringLength extends AbstractValidator
. " " . $this->getMax());
}
- $this->options['min'] = max(0, (integer) $min);
+ $this->options['min'] = max(0, (int) $min);
return $this;
}
/**
* Returns the max option
*
- * @return integer|null
+ * @return int|null
*/
public function getMax()
{
@@ -108,7 +108,7 @@ class StringLength extends AbstractValidator
/**
* Sets the max option
*
- * @param integer|null $max
+ * @param int|null $max
* @throws Exception\InvalidArgumentException
* @return StringLength Provides a fluent interface
*/
@@ -120,7 +120,7 @@ class StringLength extends AbstractValidator
throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum length, but "
. "$max < " . $this->getMin());
} else {
- $this->options['max'] = (integer) $max;
+ $this->options['max'] = (int) $max;
}
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..7089da2d92f393660ccf726b9dae3a53df918a76
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *;
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Validator\Translator;
+
+interface TranslatorAwareInterface
+{
+ /**
+ * Sets translator to use in helper
+ *
+ * @param TranslatorInterface $translator [optional] translator.
+ * Default is null, which sets no translator.
+ * @param string $textDomain [optional] text domain
+ * Default is null, which skips setTranslatorTextDomain
+ * @return self
+ */
+ public function setTranslator(TranslatorInterface $translator = null, $textDomain = null);
+
+ /**
+ * Returns translator used in object
+ *
+ * @return TranslatorInterface|null
+ */
+ public function getTranslator();
+
+ /**
+ * Checks if the object has a translator
+ *
+ * @return bool
+ */
+ public function hasTranslator();
+
+ /**
+ * Sets whether translator is enabled and should be used
+ *
+ * @param bool $enabled [optional] whether translator should be used.
+ * Default is true.
+ * @return self
+ */
+ public function setTranslatorEnabled($enabled = true);
+
+ /**
+ * Returns whether translator is enabled and should be used
+ *
+ * @return bool
+ */
+ public function isTranslatorEnabled();
+
+ /**
+ * Set translation text domain
+ *
+ * @param string $textDomain
+ * @return TranslatorAwareInterface
+ */
+ public function setTranslatorTextDomain($textDomain = 'default');
+
+ /**
+ * Return the translation text domain
+ *
+ * @return string
+ */
+ public function getTranslatorTextDomain();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..e800b29504a1f04fb0381a85da953ca7f59ab786
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Validator\Translator;
+
+interface TranslatorInterface
+{
+ /**
+ * @param string $message
+ * @param string $textDomain
+ * @param string $locale
+ * @return string
+ */
+ public function translate($message, $textDomain = 'default', $locale = null);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php
index ebcc728aac130aed735e557cd68752343d483d2c..d3aa1980644c3afad038784eb3cb16882d893ae7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php
@@ -106,7 +106,7 @@ class ValidatorChain implements
*
* @deprecated Please use attach()
* @param ValidatorInterface $validator
- * @param boolean $breakChainOnFailure
+ * @param bool $breakChainOnFailure
* @return ValidatorChain Provides a fluent interface
*/
public function addValidator(ValidatorInterface $validator, $breakChainOnFailure = false)
@@ -266,6 +266,6 @@ class ValidatorChain implements
*/
public function __sleep()
{
- return array('validators','messages');
+ return array('validators', 'messages');
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
index c3153e272ae353e2a054410a16d123662c9f73b3..adc6f133766a16fe0e6a84004ad370197b6cb018 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
@@ -9,7 +9,6 @@
namespace Zend\Validator;
-use Zend\I18n\Translator\TranslatorAwareInterface;
use Zend\ServiceManager\AbstractPluginManager;
use Zend\ServiceManager\ConfigInterface;
@@ -124,6 +123,7 @@ class ValidatorPluginManager extends AbstractPluginManager
{
parent::__construct($configuration);
$this->addInitializer(array($this, 'injectTranslator'));
+ $this->addInitializer(array($this, 'injectValidatorPluginManager'));
}
/**
@@ -134,14 +134,27 @@ class ValidatorPluginManager extends AbstractPluginManager
*/
public function injectTranslator($validator)
{
- if ($validator instanceof TranslatorAwareInterface) {
+ if ($validator instanceof Translator\TranslatorAwareInterface) {
$locator = $this->getServiceLocator();
- if ($locator && $locator->has('translator')) {
- $validator->setTranslator($locator->get('translator'));
+ if ($locator && $locator->has('MvcTranslator')) {
+ $validator->setTranslator($locator->get('MvcTranslator'));
}
}
}
+ /**
+ * Inject a validator plugin manager
+ *
+ * @param $validator
+ * @return void
+ */
+ public function injectValidatorPluginManager($validator)
+ {
+ if ($validator instanceof ValidatorPluginManagerAwareInterface) {
+ $validator->setValidatorPluginManager($this);
+ }
+ }
+
/**
* Validate the plugin
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffce9f85b97e04a91ef4c3a1bf61f2b65267aa93
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Validator;
+
+interface ValidatorPluginManagerAwareInterface
+{
+ /**
+ * Set validator plugin manager
+ *
+ * @param ValidatorPluginManager $pluginManager
+ */
+ public function setValidatorPluginManager(ValidatorPluginManager $pluginManager);
+
+ /**
+ * Get validator plugin manager
+ *
+ * @return ValidatorPluginManager
+ */
+ public function getValidatorPluginManager();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/composer.json b/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
index 693c1b1912aefa0d9b7c29e13a077a3ed17a37ee..3cc7b1853e949c732856223fa66f152cc9379e27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
@@ -14,21 +14,23 @@
"target-dir": "Zend/Validator",
"require": {
"php": ">=5.3.3",
- "zendframework/zend-i18n": "self.version",
- "zendframework/zend-servicemanager": "self.version",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
- "zendframework/zend-math": "self.version"
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-math": "self.version",
+ "zendframework/zend-servicemanager": "self.version"
},
"suggest": {
"zendframework/zend-db": "Zend\\Db component",
- "zendframework/zend-math": "Zend\\Math component"
+ "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
+ "zendframework/zend-math": "Zend\\Math component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains"
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index 08325138bb8006b0d7bd243d32adc479acad2da2..870c90511321d23ea3ae34a52dc30e9c7412f776 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
@@ -19,7 +19,7 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.1.5';
+ const VERSION = '2.2.0';
/**
* Github Service Identifier for version information is retreived from
@@ -73,7 +73,7 @@ final class Version
* @param string $service Version Service with which to retrieve the version
* @return string
*/
- public static function getLatest($service = self::VERSION_SERVICE_GITHUB)
+ public static function getLatest($service = self::VERSION_SERVICE_ZEND)
{
if (null === static::$latestVersion) {
static::$latestVersion = 'not available';
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/composer.json b/vendor/zendframework/zendframework/library/Zend/Version/composer.json
index 7dce27611fc9882d98b57ca312f0c97631e45091..9059e2799dda15047515fafb8e20559738ff2580 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Version/composer.json
@@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
index 8234a8a6dc31176c80dae17bdd2655658c009b62..6dce9330cb50d2fded90a430090dc47adc0e1df1 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
@@ -15,7 +15,7 @@ use Zend\View\Renderer\RendererInterface as Renderer;
abstract class AbstractHelper implements HelperInterface
{
/**
- * View object
+ * View object instance
*
* @var Renderer
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
index 037074117ca2ee19927d4a94a97109f662e21360..4932fd8aaf022960120d1eb2445d5cd5d7e635b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
@@ -48,8 +48,7 @@ abstract class AbstractHtmlElement extends AbstractHelper
*/
protected function isXhtml()
{
- $doctype = $this->view->plugin('doctype');
- return $doctype->isXhtml();
+ return $this->getView()->plugin('doctype')->isXhtml();
}
/**
@@ -65,7 +64,8 @@ abstract class AbstractHtmlElement extends AbstractHelper
protected function htmlAttribs($attribs)
{
$xhtml = '';
- $escaper = $this->view->plugin('escapehtml');
+ $escaper = $this->getView()->plugin('escapehtml');
+
foreach ((array) $attribs as $key => $val) {
$key = $escaper($key);
@@ -96,8 +96,8 @@ abstract class AbstractHtmlElement extends AbstractHelper
} else {
$xhtml .= " $key=\"$val\"";
}
-
}
+
return $xhtml;
}
@@ -117,6 +117,7 @@ abstract class AbstractHtmlElement extends AbstractHelper
$value = str_replace('][', '-', $value);
$value = str_replace('[', '-', $value);
}
+
return $value;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php
index dc1b2d483d542e9aa6ee2c94c98fd42841f526ad..b2fd3d6c7e74767367f02b87d61e0b29540a794f 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php
@@ -17,7 +17,7 @@ use Zend\View\Exception;
class BasePath extends AbstractHelper
{
/**
- * Base path.
+ * Base path
*
* @var string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
index 60a296d4aae63236af95e04ae466e1cb515c8fbb..c116b0a8ef17e5a876658bf8085fe95695b6e8d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
@@ -14,20 +14,12 @@ namespace Zend\View\Helper;
*/
class Cycle extends AbstractHelper implements \Iterator
{
-
/**
* Default name
* @var string
*/
const DEFAULT_NAME = 'default';
- /**
- * Pointers
- *
- * @var array
- */
- protected $pointers = array(self::DEFAULT_NAME =>-1);
-
/**
* Array of values
*
@@ -42,28 +34,56 @@ class Cycle extends AbstractHelper implements \Iterator
*/
protected $name = self::DEFAULT_NAME;
+ /**
+ * Pointers
+ *
+ * @var array
+ */
+ protected $pointers = array(self::DEFAULT_NAME =>-1);
+
/**
* Add elements to alternate
*
- * @param array $data
- * @param string $name
- * @return \Zend\View\Helper\Cycle
+ * @param array $data
+ * @param string $name
+ * @return Cycle
*/
public function __invoke(array $data = array(), $name = self::DEFAULT_NAME)
{
- if (!empty($data))
+ if (!empty($data)) {
$this->data[$name] = $data;
+ }
$this->setName($name);
return $this;
}
+ /**
+ * Cast to string
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->toString();
+ }
+
+ /**
+ * Turn helper into string
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return (string) $this->data[$this->name][$this->key()];
+ }
+
/**
* Add elements to alternate
*
- * @param array $data
- * @param string $name
- * @return \Zend\View\Helper\Cycle
+ * @param array $data
+ * @param string $name
+ * @return Cycle
*/
public function assign(Array $data , $name = self::DEFAULT_NAME)
{
@@ -76,18 +96,20 @@ class Cycle extends AbstractHelper implements \Iterator
/**
* Sets actual name of cycle
*
- * @param $name
- * @return \Zend\View\Helper\Cycle
+ * @param $name
+ * @return Cycle
*/
public function setName($name = self::DEFAULT_NAME)
{
$this->name = $name;
- if (!isset($this->data[$this->name]))
- $this->data[$this->name] = array();
+ if (!isset($this->data[$this->name])) {
+ $this->data[$this->name] = array();
+ }
- if (!isset($this->pointers[$this->name]))
- $this->rewind();
+ if (!isset($this->pointers[$this->name])) {
+ $this->rewind();
+ }
return $this;
}
@@ -113,53 +135,39 @@ class Cycle extends AbstractHelper implements \Iterator
return $this->data[$this->name];
}
- /**
- * Turn helper into string
- *
- * @return string
- */
- public function toString()
- {
- return (string) $this->data[$this->name][$this->key()];
- }
-
- /**
- * Cast to string
- *
- * @return string
- */
- public function __toString()
- {
- return $this->toString();
- }
-
/**
* Move to next value
*
- * @return \Zend\View\Helper\Cycle
+ * @return Cycle
*/
public function next()
{
$count = count($this->data[$this->name]);
- if ($this->pointers[$this->name] == ($count - 1))
+
+ if ($this->pointers[$this->name] == ($count - 1)) {
$this->pointers[$this->name] = 0;
- else
+ } else {
$this->pointers[$this->name] = ++$this->pointers[$this->name];
+ }
+
return $this;
}
/**
* Move to previous value
*
- * @return \Zend\View\Helper\Cycle
+ * @return Cycle
*/
public function prev()
{
$count = count($this->data[$this->name]);
- if ($this->pointers[$this->name] <= 0)
+
+ if ($this->pointers[$this->name] <= 0) {
$this->pointers[$this->name] = $count - 1;
- else
+ } else {
$this->pointers[$this->name] = --$this->pointers[$this->name];
+ }
+
return $this;
}
@@ -170,16 +178,17 @@ class Cycle extends AbstractHelper implements \Iterator
*/
public function key()
{
- if ($this->pointers[$this->name] < 0)
+ if ($this->pointers[$this->name] < 0) {
return 0;
- else
+ } else {
return $this->pointers[$this->name];
+ }
}
/**
* Rewind pointer
*
- * @return \Zend\View\Helper\Cycle
+ * @return Cycle
*/
public function rewind()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php
index d2dde4bcdbefc9b74f1a6c1d0e9a5adda09881e6..c3194851511a1c956535e8f6ad6e969139fa2776 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php
@@ -16,6 +16,7 @@ class DeclareVars extends AbstractHelper
{
/**
* The view object that created this helper object.
+ *
* @var \Zend\View\View
*/
public $view;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php
index ed3d5e725f437780bc1ba0bd5d991e54868e43b6..cb052ea8e2ca833e236a3564344f42ce319bd00e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php
@@ -36,60 +36,24 @@ class Doctype extends AbstractHelper
const CUSTOM = 'CUSTOM';
/**#@-*/
- /**
- * @var ArrayObject Shared doctypes to use throughout all instances
- */
- protected static $registeredDoctypes;
-
/**
* Default DocType
+ *
* @var string
*/
protected $defaultDoctype = self::HTML4_LOOSE;
/**
* Registry containing current doctype and mappings
+ *
* @var ArrayObject
*/
protected $registry;
/**
- * Register the default doctypes we understand
- *
- * @return void
- */
- protected static function registerDefaultDoctypes()
- {
- static::$registeredDoctypes = new ArrayObject(array(
- 'doctypes' => array(
- self::XHTML11 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
- self::XHTML1_STRICT => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
- self::XHTML1_TRANSITIONAL => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
- self::XHTML1_FRAMESET => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
- self::XHTML1_RDFA => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
- self::XHTML1_RDFA11 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
- self::XHTML_BASIC1 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">',
- self::XHTML5 => '<!DOCTYPE html>',
- self::HTML4_STRICT => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
- self::HTML4_LOOSE => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
- self::HTML4_FRAMESET => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
- self::HTML5 => '<!DOCTYPE html>',
- ),
- ));
- }
-
- /**
- * Unset the static doctype registry
- *
- * Mainly useful for testing purposes. Sets {@link $registeredDoctypes} to
- * a null value.
- *
- * @return void
+ * @var ArrayObject Shared doctypes to use throughout all instances
*/
- public static function unsetDoctypeRegistry()
- {
- static::$registeredDoctypes = null;
- }
+ protected static $registeredDoctypes;
/**
* Constructor
@@ -109,8 +73,8 @@ class Doctype extends AbstractHelper
* Set or retrieve doctype
*
* @param string $doctype
- * @return Doctype Provides a fluent interface
* @throws Exception\DomainException
+ * @return Doctype
*/
public function __invoke($doctype = null)
{
@@ -148,6 +112,56 @@ class Doctype extends AbstractHelper
return $this;
}
+ /**
+ * String representation of doctype
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ $doctypes = $this->getDoctypes();
+
+ return $doctypes[$this->getDoctype()];
+ }
+
+ /**
+ * Register the default doctypes we understand
+ *
+ * @return void
+ */
+ protected static function registerDefaultDoctypes()
+ {
+ static::$registeredDoctypes = new ArrayObject(array(
+ 'doctypes' => array(
+ self::XHTML11 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+ self::XHTML1_STRICT => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+ self::XHTML1_TRANSITIONAL => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+ self::XHTML1_FRAMESET => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+ self::XHTML1_RDFA => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+ self::XHTML1_RDFA11 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
+ self::XHTML_BASIC1 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">',
+ self::XHTML5 => '<!DOCTYPE html>',
+ self::HTML4_STRICT => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+ self::HTML4_LOOSE => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+ self::HTML4_FRAMESET => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+ self::HTML5 => '<!DOCTYPE html>',
+ ),
+ ));
+ }
+
+ /**
+ * Unset the static doctype registry
+ *
+ * Mainly useful for testing purposes. Sets {@link $registeredDoctypes} to
+ * a null value.
+ *
+ * @return void
+ */
+ public static function unsetDoctypeRegistry()
+ {
+ static::$registeredDoctypes = null;
+ }
+
/**
* Set doctype
*
@@ -170,6 +184,7 @@ class Doctype extends AbstractHelper
if (!isset($this->registry['doctype'])) {
$this->setDoctype($this->defaultDoctype);
}
+
return $this->registry['doctype'];
}
@@ -212,15 +227,4 @@ class Doctype extends AbstractHelper
{
return ($this->isHtml5() || stristr($this->getDoctype(), 'rdfa') ? true : false);
}
-
- /**
- * String representation of doctype
- *
- * @return string
- */
- public function __toString()
- {
- $doctypes = $this->getDoctypes();
- return $doctypes[$this->getDoctype()];
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php
index adc4c4ca4c86b363ebb2a14862cbbc7dd18e4dca..c3396a4c2413fc66a1540cf6b9bbcfd9d968f8aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php
@@ -16,11 +16,10 @@ use Zend\View\Helper\Escaper;
*/
class EscapeCss extends Escaper\AbstractHelper
{
-
/**
* Escape a value for current escaping strategy
*
- * @param string $value
+ * @param string $value
* @return string
*/
protected function escape($value)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php
index c27a32895e9e8d0cc6ad24f426a1e5ca931e91e9..3e16cf21d013af43cd556c6ee2687b4b5e100b56 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php
@@ -16,11 +16,10 @@ use Zend\View\Helper\Escaper;
*/
class EscapeHtml extends Escaper\AbstractHelper
{
-
/**
* Escape a value for current escaping strategy
*
- * @param string $value
+ * @param string $value
* @return string
*/
protected function escape($value)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php
index cf242a67ce250fcb37e95e6ef7ec20b8de42eb92..d94883f32a8a5419e26c2840cfdccf6da5091a4d 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php
@@ -16,11 +16,10 @@ use Zend\View\Helper\Escaper;
*/
class EscapeHtmlAttr extends Escaper\AbstractHelper
{
-
/**
* Escape a value for current escaping strategy
*
- * @param string $value
+ * @param string $value
* @return string
*/
protected function escape($value)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php
index 2b47793dc500c7fec9b2c55e6e684ec0a9f73900..590e457bcb2b06645af34bc734cb8f6d49a23330 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php
@@ -16,11 +16,10 @@ use Zend\View\Helper\Escaper;
*/
class EscapeJs extends Escaper\AbstractHelper
{
-
/**
* Escape a value for current escaping strategy
*
- * @param string $value
+ * @param string $value
* @return string
*/
protected function escape($value)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php
index e21bb95c2cb990c61c65b2b779f9ea98c4333787..90e845e7d561b53ea4b97865f443ad8429aa4405 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php
@@ -16,11 +16,10 @@ use Zend\View\Helper\Escaper;
*/
class EscapeUrl extends Escaper\AbstractHelper
{
-
/**
* Escape a value for current escaping strategy
*
- * @param string $value
+ * @param string $value
* @return string
*/
protected function escape($value)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php
index 4a51ea0bc37e3898ad983a10106e24d4f2159ce6..2fbdfa51f4f47ef41236b72261c984f5f13c2cf5 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php
@@ -18,82 +18,37 @@ use Zend\View\Helper;
*/
abstract class AbstractHelper extends Helper\AbstractHelper
{
-
- /**@+
+ /**
* @const Recursion constants
*/
const RECURSE_NONE = 0x00;
const RECURSE_ARRAY = 0x01;
const RECURSE_OBJECT = 0x02;
- /**@-*/
-
- /**
- * @var Escaper\Escaper
- */
- protected $escaper = null;
/**
* @var string Encoding
*/
protected $encoding = 'UTF-8';
- public function setEscaper(Escaper\Escaper $escaper)
- {
- $this->escaper = $escaper;
- $this->encoding = $escaper->getEncoding();
- return $this;
- }
-
- public function getEscaper()
- {
- if (null === $this->escaper) {
- $this->setEscaper(new Escaper\Escaper($this->getEncoding()));
- }
- return $this->escaper;
- }
-
/**
- * Set the encoding to use for escape operations
- *
- * @param string $encoding
- * @throws Exception\InvalidArgumentException
- * @return AbstractHelper
- */
- public function setEncoding($encoding)
- {
- if (null !== $this->escaper) {
- throw new Exception\InvalidArgumentException(
- 'Character encoding settings cannot be changed once the Helper has been used or '
- . ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
- );
- }
- $this->encoding = $encoding;
- return $this;
- }
-
- /**
- * Get the encoding to use for escape operations
- *
- * @return string
+ * @var Escaper\Escaper
*/
- public function getEncoding()
- {
- return $this->encoding;
- }
+ protected $escaper = null;
/**
* Invoke this helper: escape a value
*
* @param mixed $value
- * @param int $recurse Expects one of the recursion constants; used to decide whether or not to recurse the given value when escaping
- * @return mixed Given a scalar, a scalar value is returned. Given an object, with the $recurse flag not allowing object recursion, returns a string. Otherwise, returns an array.
+ * @param int $recurse Expects one of the recursion constants; used to decide whether or not to recurse the given value when escaping
* @throws Exception\InvalidArgumentException
+ * @return mixed Given a scalar, a scalar value is returned. Given an object, with the $recurse flag not allowing object recursion, returns a string. Otherwise, returns an array.
*/
public function __invoke($value, $recurse = self::RECURSE_NONE)
{
if (is_string($value)) {
return $this->escape($value);
}
+
if (is_array($value)) {
if (!(self::RECURSE_ARRAY & $recurse)) {
throw new Exception\InvalidArgumentException(
@@ -105,6 +60,7 @@ abstract class AbstractHelper extends Helper\AbstractHelper
}
return $value;
}
+
if (is_object($value)) {
if (!(self::RECURSE_OBJECT & $recurse)) {
// Attempt to cast it to a string
@@ -120,16 +76,74 @@ abstract class AbstractHelper extends Helper\AbstractHelper
}
return $this->__invoke((array) $value, $recurse | self::RECURSE_ARRAY);
}
- // At this point, we have a scalar; simply return it
+
return $value;
}
/**
* Escape a value for current escaping strategy
*
- * @param string $value
+ * @param string $value
* @return string
*/
abstract protected function escape($value);
+ /**
+ * Set the encoding to use for escape operations
+ *
+ * @param string $encoding
+ * @throws Exception\InvalidArgumentException
+ * @return AbstractHelper
+ */
+ public function setEncoding($encoding)
+ {
+ if (null !== $this->escaper) {
+ throw new Exception\InvalidArgumentException(
+ 'Character encoding settings cannot be changed once the Helper has been used or '
+ . ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
+ );
+ }
+
+ $this->encoding = $encoding;
+
+ return $this;
+ }
+
+ /**
+ * Get the encoding to use for escape operations
+ *
+ * @return string
+ */
+ public function getEncoding()
+ {
+ return $this->encoding;
+ }
+
+ /**
+ * Set instance of Escaper
+ *
+ * @param Escaper\Escaper $escaper
+ * @return AbstractHelper
+ */
+ public function setEscaper(Escaper\Escaper $escaper)
+ {
+ $this->escaper = $escaper;
+ $this->encoding = $escaper->getEncoding();
+
+ return $this;
+ }
+
+ /**
+ * Get instance of Escaper
+ *
+ * @return null|Escaper\Escaper
+ */
+ public function getEscaper()
+ {
+ if (null === $this->escaper) {
+ $this->setEscaper(new Escaper\Escaper($this->getEncoding()));
+ }
+
+ return $this->escaper;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php
index e94aa8bcd089c0e17d3d0d6668cf0579924b62be..7e71fcca797b833287cf86a19e2d677ac4bc5614 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php
@@ -22,36 +22,46 @@ use Zend\I18n\View\Helper\AbstractTranslatorHelper;
class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorAwareInterface
{
/**
- * @var ServiceLocatorInterface
+ * Default attributes for the open format tag
+ *
+ * @var array
*/
- protected $serviceLocator;
+ protected $classMessages = array(
+ PluginFlashMessenger::NAMESPACE_INFO => 'info',
+ PluginFlashMessenger::NAMESPACE_ERROR => 'error',
+ PluginFlashMessenger::NAMESPACE_SUCCESS => 'success',
+ PluginFlashMessenger::NAMESPACE_DEFAULT => 'default',
+ );
/**
- * @var string Templates for the open/close/separators for message tags
+ * Templates for the open/close/separators for message tags
+ *
+ * @var string
*/
protected $messageCloseString = '</li></ul>';
protected $messageOpenFormat = '<ul%s><li>';
protected $messageSeparatorString = '</li><li>';
/**
+ * Html escape helper
+ *
* @var EscapeHtml
*/
protected $escapeHtmlHelper;
/**
+ * Flash messenger plugin
+ *
* @var PluginFlashMessenger
*/
protected $pluginFlashMessenger;
/**
- * @var array Default attributes for the open format tag
+ * Service locator
+ *
+ * @var ServiceLocatorInterface
*/
- protected $classMessages = array(
- PluginFlashMessenger::NAMESPACE_INFO => 'info',
- PluginFlashMessenger::NAMESPACE_ERROR => 'error',
- PluginFlashMessenger::NAMESPACE_SUCCESS => 'success',
- PluginFlashMessenger::NAMESPACE_DEFAULT => 'default',
- );
+ protected $serviceLocator;
/**
* Returns the flash messenger plugin controller
@@ -79,7 +89,6 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
public function __call($method, $argv)
{
$flashMessenger = $this->getPluginFlashMessenger();
-
return call_user_func_array(array($flashMessenger, $method), $argv);
}
@@ -133,13 +142,12 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
/**
* Set the string used to close message representation
*
- * @param string $messageCloseString
+ * @param string $messageCloseString
* @return FlashMessenger
*/
public function setMessageCloseString($messageCloseString)
{
$this->messageCloseString = (string) $messageCloseString;
-
return $this;
}
@@ -156,13 +164,12 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
/**
* Set the formatted string used to open message representation
*
- * @param string $messageOpenFormat
+ * @param string $messageOpenFormat
* @return FlashMessenger
*/
public function setMessageOpenFormat($messageOpenFormat)
{
$this->messageOpenFormat = (string) $messageOpenFormat;
-
return $this;
}
@@ -179,13 +186,12 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
/**
* Set the string used to separate messages
*
- * @param string $messageSeparatorString
+ * @param string $messageSeparatorString
* @return FlashMessenger
*/
public function setMessageSeparatorString($messageSeparatorString)
{
$this->messageSeparatorString = (string) $messageSeparatorString;
-
return $this;
}
@@ -200,25 +206,15 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
}
/**
- * Retrieve the escapeHtml helper
+ * Set the flash messenger plugin
*
- * @return EscapeHtml
+ * @param PluginFlashMessenger $pluginFlashMessenger
+ * @return FlashMessenger
*/
- protected function getEscapeHtmlHelper()
+ public function setPluginFlashMessenger(PluginFlashMessenger $pluginFlashMessenger)
{
- if ($this->escapeHtmlHelper) {
- return $this->escapeHtmlHelper;
- }
-
- if (method_exists($this->view, 'plugin')) {
- $this->escapeHtmlHelper = $this->view->plugin('escapehtml');
- }
-
- if (!$this->escapeHtmlHelper instanceof EscapeHtml) {
- $this->escapeHtmlHelper = new EscapeHtml();
- }
-
- return $this->escapeHtmlHelper;
+ $this->pluginFlashMessenger = $pluginFlashMessenger;
+ return $this;
}
/**
@@ -235,19 +231,6 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
return $this->pluginFlashMessenger;
}
- /**
- * Set the flash messenger plugin
- *
- * @param PluginFlashMessenger $pluginFlashMessenger
- * @return FlashMessenger
- */
- public function setPluginFlashMessenger(PluginFlashMessenger $pluginFlashMessenger)
- {
- $this->pluginFlashMessenger = $pluginFlashMessenger;
-
- return $this;
- }
-
/**
* Set the service locator.
*
@@ -257,7 +240,6 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
{
$this->serviceLocator = $serviceLocator;
-
return $this;
}
@@ -270,4 +252,26 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
{
return $this->serviceLocator;
}
+
+ /**
+ * Retrieve the escapeHtml helper
+ *
+ * @return EscapeHtml
+ */
+ protected function getEscapeHtmlHelper()
+ {
+ if ($this->escapeHtmlHelper) {
+ return $this->escapeHtmlHelper;
+ }
+
+ if (method_exists($this->getView(), 'plugin')) {
+ $this->escapeHtmlHelper = $this->view->plugin('escapehtml');
+ }
+
+ if (!$this->escapeHtmlHelper instanceof EscapeHtml) {
+ $this->escapeHtmlHelper = new EscapeHtml();
+ }
+
+ return $this->escapeHtmlHelper;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
index 7c1202bc6762023ad395c94304e42d782c0ae547..a37330edc472850c5dd2d7279ef8016ece86334b 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
@@ -43,16 +43,11 @@ class Gravatar extends AbstractHtmlElement
const DEFAULT_WAVATAR = 'wavatar';
/**
- * Options
+ * Attributes for HTML image tag
*
* @var array
*/
- protected $options = array(
- 'img_size' => 80,
- 'default_img' => self::DEFAULT_MM,
- 'rating' => self::RATING_G,
- 'secure' => null,
- );
+ protected $attribs;
/**
* Email Address
@@ -62,11 +57,16 @@ class Gravatar extends AbstractHtmlElement
protected $email;
/**
- * Attributes for HTML image tag
+ * Options
*
* @var array
*/
- protected $attribs;
+ protected $options = array(
+ 'img_size' => 80,
+ 'default_img' => self::DEFAULT_MM,
+ 'rating' => self::RATING_G,
+ 'secure' => null,
+ );
/**
* Returns an avatar from gravatar's service.
@@ -79,9 +79,9 @@ class Gravatar extends AbstractHtmlElement
*
* @see http://pl.gravatar.com/site/implement/url
* @see http://pl.gravatar.com/site/implement/url More information about gravatar's service.
- * @param string|null $email Email address.
- * @param null|array $options Options
- * @param array $attribs Attributes for image tag (title, alt etc.)
+ * @param string|null $email Email address.
+ * @param null|array $options Options
+ * @param array $attribs Attributes for image tag (title, alt etc.)
* @return Gravatar
*/
public function __invoke($email = "", $options = array(), $attribs = array())
@@ -95,9 +95,20 @@ class Gravatar extends AbstractHtmlElement
if (!empty($attribs)) {
$this->setAttribs($attribs);
}
+
return $this;
}
+ /**
+ * Return valid image tag
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->getImgTag();
+ }
+
/**
* Configure state
*
@@ -112,101 +123,113 @@ class Gravatar extends AbstractHtmlElement
$this->{$method}($value);
}
}
+
return $this;
}
/**
- * Get img size
+ * Get avatar url (including size, rating and default image options)
*
- * @return int The img size
+ * @return string
*/
- public function getImgSize()
+ protected function getAvatarUrl()
{
- return $this->options['img_size'];
+ $src = $this->getGravatarUrl()
+ . '/' . md5($this->getEmail())
+ . '?s=' . $this->getImgSize()
+ . '&d=' . $this->getDefaultImg()
+ . '&r=' . $this->getRating();
+ return $src;
}
/**
- * Set img size in pixels
+ * Get URL to gravatar's service.
*
- * @param int $imgSize Size of img must be between 1 and 512
- * @return Gravatar
+ * @return string URL
*/
- public function setImgSize($imgSize)
+ protected function getGravatarUrl()
{
- $this->options['img_size'] = (int) $imgSize;
- return $this;
+ return ($this->getSecure() === false) ? self::GRAVATAR_URL : self::GRAVATAR_URL_SECURE;
}
/**
- * Get default img
+ * Return valid image tag
*
* @return string
*/
- public function getDefaultImg()
+ public function getImgTag()
{
- return $this->options['default_img'];
+ $this->setSrcAttribForImg();
+ $html = '<img'
+ . $this->htmlAttribs($this->getAttribs())
+ . $this->getClosingBracket();
+
+ return $html;
}
/**
- * Set default img
+ * Set attribs for image tag
*
- * Can be either an absolute URL to an image, or one of the DEFAULT_* constants
+ * Warning! You shouldn't set src attrib for image tag.
+ * This attrib is overwritten in protected method setSrcAttribForImg().
+ * This method(_setSrcAttribForImg) is called in public method getImgTag().
*
- * @link http://pl.gravatar.com/site/implement/url More information about default image.
- * @param string $defaultImg
+ * @param array $attribs
* @return Gravatar
*/
- public function setDefaultImg($defaultImg)
+ public function setAttribs(array $attribs)
{
- $this->options['default_img'] = urlencode($defaultImg);
+ $this->attribs = $attribs;
return $this;
}
/**
- * Set rating value
+ * Get attribs of image
*
- * Must be one of the RATING_* constants
+ * Warning!
+ * If you set src attrib, you get it, but this value will be overwritten in
+ * protected method setSrcAttribForImg(). And finally your get other src
+ * value!
*
- * @link http://pl.gravatar.com/site/implement/url More information about rating.
- * @param string $rating Value for rating. Allowed values are: g, px, r,x
+ * @return array
+ */
+ public function getAttribs()
+ {
+ return $this->attribs;
+ }
+
+ /**
+ * Set default img
+ *
+ * Can be either an absolute URL to an image, or one of the DEFAULT_* constants
+ *
+ * @link http://pl.gravatar.com/site/implement/url More information about default image.
+ * @param string $defaultImg
* @return Gravatar
- * @throws Exception\DomainException
*/
- public function setRating($rating)
+ public function setDefaultImg($defaultImg)
{
- switch ($rating) {
- case self::RATING_G:
- case self::RATING_PG:
- case self::RATING_R:
- case self::RATING_X:
- $this->options['rating'] = $rating;
- break;
- default:
- throw new Exception\DomainException(sprintf(
- 'The rating value "%s" is not allowed',
- $rating
- ));
- }
+ $this->options['default_img'] = urlencode($defaultImg);
return $this;
}
/**
- * Get rating value
+ * Get default img
*
* @return string
*/
- public function getRating()
+ public function getDefaultImg()
{
- return $this->options['rating'];
+ return $this->options['default_img'];
}
/**
* Set email address
*
- * @param string $email
+ * @param string $email
* @return Gravatar
*/
- public function setEmail( $email )
+ public function setEmail($email)
{
$this->email = $email;
return $this;
@@ -223,84 +246,90 @@ class Gravatar extends AbstractHtmlElement
}
/**
- * Load from an SSL or No-SSL location?
+ * Set img size in pixels
*
- * @param bool $flag
+ * @param int $imgSize Size of img must be between 1 and 512
* @return Gravatar
*/
- public function setSecure($flag)
+ public function setImgSize($imgSize)
{
- $this->options['secure'] = ($flag === null) ? null : (bool) $flag;
+ $this->options['img_size'] = (int) $imgSize;
return $this;
}
/**
- * Get an SSL or a No-SSL location
+ * Get img size
*
- * @return bool
+ * @return int The img size
*/
- public function getSecure()
+ public function getImgSize()
{
- if ($this->options['secure'] === null) {
- return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
- }
- return $this->options['secure'];
+ return $this->options['img_size'];
}
/**
- * Get attribs of image
+ * Set rating value
*
- * Warning!
- * If you set src attrib, you get it, but this value will be overwritten in
- * protected method setSrcAttribForImg(). And finally your get other src
- * value!
+ * Must be one of the RATING_* constants
*
- * @return array
+ * @link http://pl.gravatar.com/site/implement/url More information about rating.
+ * @param string $rating Value for rating. Allowed values are: g, px, r,x
+ * @return Gravatar
+ * @throws Exception\DomainException
*/
- public function getAttribs()
+ public function setRating($rating)
{
- return $this->attribs;
+ switch ($rating) {
+ case self::RATING_G:
+ case self::RATING_PG:
+ case self::RATING_R:
+ case self::RATING_X:
+ $this->options['rating'] = $rating;
+ break;
+ default:
+ throw new Exception\DomainException(sprintf(
+ 'The rating value "%s" is not allowed',
+ $rating
+ ));
+ }
+
+ return $this;
}
/**
- * Set attribs for image tag
- *
- * Warning! You shouldn't set src attrib for image tag.
- * This attrib is overwritten in protected method setSrcAttribForImg().
- * This method(_setSrcAttribForImg) is called in public method getImgTag().
+ * Get rating value
*
- * @param array $attribs
- * @return Gravatar
+ * @return string
*/
- public function setAttribs(array $attribs)
+ public function getRating()
{
- $this->attribs = $attribs;
- return $this;
+ return $this->options['rating'];
}
/**
- * Get URL to gravatar's service.
+ * Load from an SSL or No-SSL location?
*
- * @return string URL
+ * @param bool $flag
+ * @return Gravatar
*/
- protected function getGravatarUrl()
+ public function setSecure($flag)
{
- return ($this->getSecure() === false) ? self::GRAVATAR_URL : self::GRAVATAR_URL_SECURE;
+ $this->options['secure'] = ($flag === null) ? null : (bool) $flag;
+ return $this;
}
/**
- * Get avatar url (including size, rating and default image options)
+ * Get an SSL or a No-SSL location
*
- * @return string
+ * @return bool
*/
- protected function getAvatarUrl()
+ public function getSecure()
{
- $src = $this->getGravatarUrl()
- . '/' . md5($this->getEmail())
- . '?s=' . $this->getImgSize()
- . '&d=' . $this->getDefaultImg()
- . '&r=' . $this->getRating();
- return $src;
+ if ($this->options['secure'] === null) {
+ return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+ }
+
+ return $this->options['secure'];
}
/**
@@ -319,29 +348,4 @@ class Gravatar extends AbstractHtmlElement
$attribs['src'] = $this->getAvatarUrl();
$this->setAttribs($attribs);
}
-
- /**
- * Return valid image tag
- *
- * @return string
- */
- public function getImgTag()
- {
- $this->setSrcAttribForImg();
- $html = '<img'
- . $this->htmlAttribs($this->getAttribs())
- . $this->getClosingBracket();
-
- return $html;
- }
-
- /**
- * Return valid image tag
- *
- * @return string
- */
- public function __toString()
- {
- return $this->getImgTag();
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
index 6d9723ccc65b99382f7e02b50fd26501489c51ec..f1079f99d2cfc17c82a832db84b26a54f7fcfe27 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
@@ -16,19 +16,21 @@ use Zend\View\Exception;
/**
* Zend_Layout_View_Helper_HeadLink
*
- * @see http://www.w3.org/TR/xhtml1/dtds.html
+ * @see http://www.w3.org/TR/xhtml1/dtds.html
*/
class HeadLink extends Placeholder\Container\AbstractStandalone
{
/**
- * $validAttributes
+ * Allowed attributes
*
* @var array
*/
protected $itemKeys = array('charset', 'href', 'hreflang', 'id', 'media', 'rel', 'rev', 'type', 'title', 'extras');
/**
- * @var string registry key
+ * Registry key for placeholder
+ *
+ * @var string
*/
protected $regKey = 'Zend_View_Helper_HeadLink';
@@ -36,11 +38,11 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* Constructor
*
* Use PHP_EOL as separator
- *
*/
public function __construct()
{
parent::__construct();
+
$this->setSeparator(PHP_EOL);
}
@@ -50,9 +52,9 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* Returns current object instance. Optionally, allows passing array of
* values to build link.
*
- * @param array $attributes
- * @param string $placement
- * @return \Zend\View\Helper\HeadLink
+ * @param array $attributes
+ * @param string $placement
+ * @return HeadLink
*/
public function __invoke(array $attributes = null, $placement = Placeholder\Container\AbstractContainer::APPEND)
{
@@ -71,6 +73,7 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
break;
}
}
+
return $this;
}
@@ -105,10 +108,10 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* - public function appendSection()
* - public function appendSubsection()
*
- * @param mixed $method
- * @param mixed $args
- * @return void
+ * @param mixed $method
+ * @param mixed $args
* @throws Exception\BadMethodCallException
+ * @return void
*/
public function __call($method, $args)
{
@@ -179,8 +182,8 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* append()
*
* @param array $value
- * @return void
* @throws Exception\InvalidArgumentException
+ * @return void
*/
public function append($value)
{
@@ -197,9 +200,9 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* offsetSet()
*
* @param string|int $index
- * @param array $value
- * @return void
+ * @param array $value
* @throws Exception\InvalidArgumentException
+ * @return void
*/
public function offsetSet($index, $value)
{
@@ -216,8 +219,8 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* prepend()
*
* @param array $value
- * @return HeadLink
* @throws Exception\InvalidArgumentException
+ * @return HeadLink
*/
public function prepend($value)
{
@@ -234,8 +237,8 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* set()
*
* @param array $value
- * @return HeadLink
* @throws Exception\InvalidArgumentException
+ * @return HeadLink
*/
public function set($value)
{
@@ -321,8 +324,7 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
*/
public function createData(array $attributes)
{
- $data = (object) $attributes;
- return $data;
+ return (object) $attributes;
}
/**
@@ -366,6 +368,7 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
}
$attributes = compact('rel', 'type', 'href', 'media', 'conditionalStylesheet', 'extras');
+
return $this->createData($attributes);
}
@@ -382,6 +385,7 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
return true;
}
}
+
return false;
}
@@ -389,8 +393,8 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
* Create item for alternate link item
*
* @param array $args
- * @return stdClass
* @throws Exception\InvalidArgumentException
+ * @return stdClass
*/
public function createDataAlternate(array $args)
{
@@ -420,13 +424,14 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
$title = (string) $title;
$attributes = compact('rel', 'href', 'type', 'title', 'extras');
+
return $this->createData($attributes);
}
/**
* Create item for a prev relationship (mainly used for pagination)
*
- * @param array $args
+ * @param array $args
* @return stdClass
*/
public function createDataPrev(array $args)
@@ -435,13 +440,14 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
$href = (string) array_shift($args);
$attributes = compact('rel', 'href');
+
return $this->createData($attributes);
}
/**
* Create item for a prev relationship (mainly used for pagination)
*
- * @param array $args
+ * @param array $args
* @return stdClass
*/
public function createDataNext(array $args)
@@ -450,6 +456,7 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
$href = (string) array_shift($args);
$attributes = compact('rel', 'href');
+
return $this->createData($attributes);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
index ed0e1f4f99a1831a594c1544b15145a4363049e7..b80a8548c635fccb13036dc0aaf57bb492614690 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
@@ -16,20 +16,35 @@ use Zend\View\Exception;
/**
* Zend_Layout_View_Helper_HeadMeta
*
- * @see http://www.w3.org/TR/xhtml1/dtds.html
+ * @see http://www.w3.org/TR/xhtml1/dtds.html
*/
class HeadMeta extends Placeholder\Container\AbstractStandalone
{
/**
- * Types of attributes
+ * Allowed key types
+ *
+ * @var array
+ */
+ protected $typeKeys = array('name', 'http-equiv', 'charset', 'property', 'itemprop');
+
+ /**
+ * Required attributes for meta tag
+ *
* @var array
*/
- protected $typeKeys = array('name', 'http-equiv', 'charset', 'property');
protected $requiredKeys = array('content');
+
+ /**
+ * Allowed modifier keys
+ *
+ * @var array
+ */
protected $modifierKeys = array('lang', 'scheme');
/**
- * @var string registry key
+ * Registry key for placeholder
+ *
+ * @var string
*/
protected $regKey = 'Zend_View_Helper_HeadMeta';
@@ -42,6 +57,7 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
public function __construct()
{
parent::__construct();
+
$this->setSeparator(PHP_EOL);
}
@@ -51,9 +67,9 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
* @param string $content
* @param string $keyValue
* @param string $keyType
- * @param array $modifiers
+ * @param array $modifiers
* @param string $placement
- * @return \Zend\View\Helper\HeadMeta
+ * @return HeadMeta
*/
public function __invoke($content = null, $keyValue = null, $keyType = 'name', $modifiers = array(), $placement = Placeholder\Container\AbstractContainer::APPEND)
{
@@ -75,30 +91,6 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
return $this;
}
- /**
- * Normalize type attribute of meta
- *
- * @param string $type type in CamelCase
- * @return string
- * @throws Exception\DomainException
- */
- protected function normalizeType($type)
- {
- switch ($type) {
- case 'Name':
- return 'name';
- case 'HttpEquiv':
- return 'http-equiv';
- case 'Property':
- return 'property';
- default:
- throw new Exception\DomainException(sprintf(
- 'Invalid type "%s" passed to normalizeType',
- $type
- ));
- }
- }
-
/**
* Overload method access
*
@@ -117,13 +109,17 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
* - setProperty($keyValue, $content, $modifiers = array())
*
* @param string $method
- * @param array $args
- * @return \Zend\View\Helper\HeadMeta
+ * @param array $args
* @throws Exception\BadMethodCallException
+ * @return HeadMeta
*/
public function __call($method, $args)
{
- if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property)$/', $method, $matches)) {
+ if (preg_match(
+ '/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property|Itemprop)$/',
+ $method,
+ $matches)
+ ) {
$action = $matches['action'];
$type = $this->normalizeType($matches['type']);
$argc = count($args);
@@ -153,6 +149,7 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
}
$this->$action($item);
+
return $this;
}
@@ -160,22 +157,148 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
}
/**
- * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
+ * Render placeholder as string
*
- * Not valid in a non-HTML5 doctype
+ * @param string|int $indent
+ * @return string
+ */
+ public function toString($indent = null)
+ {
+ $indent = (null !== $indent)
+ ? $this->getWhitespace($indent)
+ : $this->getIndent();
+
+ $items = array();
+ $this->getContainer()->ksort();
+
+ try {
+ foreach ($this as $item) {
+ $items[] = $this->itemToString($item);
+ }
+ } catch (Exception\InvalidArgumentException $e) {
+ trigger_error($e->getMessage(), E_USER_WARNING);
+ return '';
+ }
+
+ return $indent . implode($this->escape($this->getSeparator()) . $indent, $items);
+ }
+
+ /**
+ * Create data item for inserting into stack
*
- * @param string $charset
- * @return \Zend\View\Helper\HeadMeta Provides a fluent interface
+ * @param string $type
+ * @param string $typeValue
+ * @param string $content
+ * @param array $modifiers
+ * @return stdClass
*/
- public function setCharset($charset)
+ public function createData($type, $typeValue, $content, array $modifiers)
{
- $item = new stdClass;
- $item->type = 'charset';
- $item->charset = $charset;
- $item->content = null;
- $item->modifiers = array();
- $this->set($item);
- return $this;
+ $data = new stdClass;
+ $data->type = $type;
+ $data->$type = $typeValue;
+ $data->content = $content;
+ $data->modifiers = $modifiers;
+
+ return $data;
+ }
+
+ /**
+ * Build meta HTML string
+ *
+ * @param stdClass $item
+ * @throws Exception\InvalidArgumentException
+ * @return string
+ */
+ public function itemToString(stdClass $item)
+ {
+ if (!in_array($item->type, $this->typeKeys)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Invalid type "%s" provided for meta',
+ $item->type
+ ));
+ }
+ $type = $item->type;
+
+ $modifiersString = '';
+ foreach ($item->modifiers as $key => $value) {
+ if ($this->view->plugin('doctype')->isHtml5()
+ && $key == 'scheme'
+ ) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid modifier "scheme" provided; not supported by HTML5'
+ );
+ }
+ if (!in_array($key, $this->modifierKeys)) {
+ continue;
+ }
+ $modifiersString .= $key . '="' . $this->escape($value) . '" ';
+ }
+
+ $modifiersString = rtrim($modifiersString);
+
+ if ('' != $modifiersString) {
+ $modifiersString = ' ' . $modifiersString;
+ }
+
+ if (method_exists($this->view, 'plugin')) {
+ if ($this->view->plugin('doctype')->isHtml5()
+ && $type == 'charset'
+ ) {
+ $tpl = ($this->view->plugin('doctype')->isXhtml())
+ ? '<meta %s="%s"/>'
+ : '<meta %s="%s">';
+ } elseif ($this->view->plugin('doctype')->isXhtml()) {
+ $tpl = '<meta %s="%s" content="%s"%s />';
+ } else {
+ $tpl = '<meta %s="%s" content="%s"%s>';
+ }
+ } else {
+ $tpl = '<meta %s="%s" content="%s"%s />';
+ }
+
+ $meta = sprintf(
+ $tpl,
+ $type,
+ $this->escape($item->$type),
+ $this->escape($item->content),
+ $modifiersString
+ );
+
+ if (isset($item->modifiers['conditional'])
+ && !empty($item->modifiers['conditional'])
+ && is_string($item->modifiers['conditional']))
+ {
+ $meta = '<!--[if ' . $this->escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->';
+ }
+
+ return $meta;
+ }
+
+ /**
+ * Normalize type attribute of meta
+ *
+ * @param string $type type in CamelCase
+ * @throws Exception\DomainException
+ * @return string
+ */
+ protected function normalizeType($type)
+ {
+ switch ($type) {
+ case 'Name':
+ return 'name';
+ case 'HttpEquiv':
+ return 'http-equiv';
+ case 'Property':
+ return 'property';
+ case 'Itemprop':
+ return 'itemprop';
+ default:
+ throw new Exception\DomainException(sprintf(
+ 'Invalid type "%s" passed to normalizeType',
+ $type
+ ));
+ }
}
/**
@@ -188,20 +311,29 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
{
if ((!$item instanceof stdClass)
|| !isset($item->type)
- || !isset($item->modifiers))
- {
+ || !isset($item->modifiers)
+ ) {
return false;
}
if (!isset($item->content)
- && (! $this->view->plugin('doctype')->isHtml5()
- || (! $this->view->plugin('doctype')->isHtml5() && $item->type !== 'charset'))) {
+ && (! $this->view->plugin('doctype')->isHtml5()
+ || (! $this->view->plugin('doctype')->isHtml5() && $item->type !== 'charset'))
+ ) {
+ return false;
+ }
+
+ // <meta itemprop= ... /> is only supported with doctype html
+ if (! $this->view->plugin('doctype')->isHtml5()
+ && $item->type === 'itemprop'
+ ) {
return false;
}
// <meta property= ... /> is only supported with doctype RDFa
if (!$this->view->plugin('doctype')->isRdfa()
- && $item->type === 'property') {
+ && $item->type === 'property'
+ ) {
return false;
}
@@ -230,9 +362,9 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
* OffsetSet
*
* @param string|int $index
- * @param string $value
- * @return void
+ * @param string $value
* @throws Exception\InvalidArgumentException
+ * @return void
*/
public function offsetSet($index, $value)
{
@@ -249,8 +381,8 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
* OffsetUnset
*
* @param string|int $index
- * @return void
* @throws Exception\InvalidArgumentException
+ * @return void
*/
public function offsetUnset($index)
{
@@ -265,8 +397,8 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
* Prepend
*
* @param string $value
- * @return void
* @throws Exception\InvalidArgumentException
+ * @return void
*/
public function prepend($value)
{
@@ -283,8 +415,8 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
* Set
*
* @param string $value
- * @return void
* @throws Exception\InvalidArgumentException
+ * @return void
*/
public function set($value)
{
@@ -303,118 +435,22 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
}
/**
- * Build meta HTML string
+ * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
*
- * @param stdClass $item
- * @throws Exception\InvalidArgumentException
- * @return string
- */
- public function itemToString(stdClass $item)
- {
- if (!in_array($item->type, $this->typeKeys)) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'Invalid type "%s" provided for meta',
- $item->type
- ));
- }
- $type = $item->type;
-
- $modifiersString = '';
- foreach ($item->modifiers as $key => $value) {
- if ($this->view->plugin('doctype')->isHtml5()
- && $key == 'scheme'
- ) {
- throw new Exception\InvalidArgumentException(
- 'Invalid modifier "scheme" provided; not supported by HTML5'
- );
- }
- if (!in_array($key, $this->modifierKeys)) {
- continue;
- }
- $modifiersString .= $key . '="' . $this->escape($value) . '" ';
- }
-
- $modifiersString = rtrim($modifiersString);
-
- if ('' != $modifiersString) {
- $modifiersString = ' ' . $modifiersString;
- }
-
- if (method_exists($this->view, 'plugin')) {
- if ($this->view->plugin('doctype')->isHtml5()
- && $type == 'charset'
- ) {
- $tpl = ($this->view->plugin('doctype')->isXhtml())
- ? '<meta %s="%s"/>'
- : '<meta %s="%s">';
- } elseif ($this->view->plugin('doctype')->isXhtml()) {
- $tpl = '<meta %s="%s" content="%s"%s />';
- } else {
- $tpl = '<meta %s="%s" content="%s"%s>';
- }
- } else {
- $tpl = '<meta %s="%s" content="%s"%s />';
- }
-
- $meta = sprintf(
- $tpl,
- $type,
- $this->escape($item->$type),
- $this->escape($item->content),
- $modifiersString
- );
-
- if (isset($item->modifiers['conditional'])
- && !empty($item->modifiers['conditional'])
- && is_string($item->modifiers['conditional']))
- {
- $meta = '<!--[if ' . $this->escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->';
- }
-
- return $meta;
- }
-
- /**
- * Render placeholder as string
+ * Not valid in a non-HTML5 doctype
*
- * @param string|int $indent
- * @return string
+ * @param string $charset
+ * @return HeadMeta Provides a fluent interface
*/
- public function toString($indent = null)
+ public function setCharset($charset)
{
- $indent = (null !== $indent)
- ? $this->getWhitespace($indent)
- : $this->getIndent();
-
- $items = array();
- $this->getContainer()->ksort();
- try {
- foreach ($this as $item) {
- $items[] = $this->itemToString($item);
- }
- } catch (Exception\InvalidArgumentException $e) {
- trigger_error($e->getMessage(), E_USER_WARNING);
- return '';
- }
- return $indent . implode($this->escape($this->getSeparator()) . $indent, $items);
- }
+ $item = new stdClass;
+ $item->type = 'charset';
+ $item->charset = $charset;
+ $item->content = null;
+ $item->modifiers = array();
+ $this->set($item);
- /**
- * Create data item for inserting into stack
- *
- * @param string $type
- * @param string $typeValue
- * @param string $content
- * @param array $modifiers
- * @return stdClass
- */
- public function createData($type, $typeValue, $content, array $modifiers)
- {
- $data = new stdClass;
- $data->type = $type;
- $data->$type = $typeValue;
- $data->content = $content;
- $data->modifiers = $modifiers;
- return $data;
+ return $this;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
index cba66226aad7b1c85f1ff0239bea1de28045c877..30609be1d361bfd44401ea60247e36b2f6614665 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
@@ -18,46 +18,66 @@ use Zend\View\Exception;
*/
class HeadScript extends Placeholder\Container\AbstractStandalone
{
- /**#@+
+ /**
* Script type constants
+ *
* @const string
*/
const FILE = 'FILE';
const SCRIPT = 'SCRIPT';
- /**#@-*/
/**
* Registry key for placeholder
+ *
* @var string
*/
protected $regKey = 'Zend_View_Helper_HeadScript';
/**
* Are arbitrary attributes allowed?
+ *
* @var bool
*/
protected $arbitraryAttributes = false;
- /**#@+
- * Capture type and/or attributes (used for hinting during capture)
- * @var string
+ /**
+ * Is capture lock?
+ *
+ * @var bool
*/
protected $captureLock;
- protected $captureScriptType = null;
+
+ /**
+ * Capture type
+ *
+ * @var string
+ */
+ protected $captureScriptType;
+
+ /**
+ * Capture attributes
+ *
+ * @var null|array
+ */
protected $captureScriptAttrs = null;
+
+ /**
+ * Capture type (append, prepend, set)
+ *
+ * @var string
+ */
protected $captureType;
- /**#@-*/
/**
* Optional allowed attributes for script tag
+ *
* @var array
*/
- protected $optionalAttributes = array(
- 'charset', 'defer', 'language', 'src'
- );
+ protected $optionalAttributes = array('charset', 'defer', 'language', 'src');
/**
* Required attributes for script tag
+ *
* @var string
*/
protected $requiredAttributes = array('type');
@@ -65,6 +85,7 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
/**
* Whether or not to format scripts using CDATA; used only if doctype
* helper is not accessible
+ *
* @var bool
*/
public $useCdata = false;
@@ -73,11 +94,11 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
* Constructor
*
* Set separator to PHP_EOL.
- *
*/
public function __construct()
{
parent::__construct();
+
$this->setSeparator(PHP_EOL);
}
@@ -92,7 +113,7 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
* @param string $placement Append, prepend, or set
* @param array $attrs Array of script attributes
* @param string $type Script type and/or array of script attributes
- * @return \Zend\View\Helper\HeadScript
+ * @return HeadScript
*/
public function __invoke($mode = HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
{
@@ -115,55 +136,6 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
return $this;
}
- /**
- * Start capture action
- *
- * @param mixed $captureType Type of capture
- * @param string $type Type of script
- * @param array $attrs Attributes of capture
- * @return void
- * @throws Exception\RuntimeException
- */
- public function captureStart($captureType = Placeholder\Container\AbstractContainer::APPEND, $type = 'text/javascript', $attrs = array())
- {
- if ($this->captureLock) {
- throw new Exception\RuntimeException('Cannot nest headScript captures');
- }
-
- $this->captureLock = true;
- $this->captureType = $captureType;
- $this->captureScriptType = $type;
- $this->captureScriptAttrs = $attrs;
- ob_start();
- }
-
- /**
- * End capture action and store
- *
- * @return void
- */
- public function captureEnd()
- {
- $content = ob_get_clean();
- $type = $this->captureScriptType;
- $attrs = $this->captureScriptAttrs;
- $this->captureScriptType = null;
- $this->captureScriptAttrs = null;
- $this->captureLock = false;
-
- switch ($this->captureType) {
- case Placeholder\Container\AbstractContainer::SET:
- case Placeholder\Container\AbstractContainer::PREPEND:
- case Placeholder\Container\AbstractContainer::APPEND:
- $action = strtolower($this->captureType) . 'Script';
- break;
- default:
- $action = 'appendScript';
- break;
- }
- $this->$action($content, $type, $attrs);
- }
-
/**
* Overload method access
*
@@ -179,8 +151,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
*
* @param string $method Method to call
* @param array $args Arguments of method
- * @return \Zend\View\Helper\HeadScript
* @throws Exception\BadMethodCallException if too few arguments or invalid method
+ * @return HeadScript
*/
public function __call($method, $args)
{
@@ -246,135 +218,143 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
}
/**
- * Is the file specified a duplicate?
+ * Retrieve string representation
*
- * @param string $file Name of file to check
- * @return bool
+ * @param string|int $indent Amount of whitespaces or string to use for indention
+ * @return string
*/
- protected function isDuplicate($file)
+ public function toString($indent = null)
{
- foreach ($this->getContainer() as $item) {
- if (($item->source === null)
- && array_key_exists('src', $item->attributes)
- && ($file == $item->attributes['src']))
- {
- return true;
- }
- }
- return false;
- }
+ $indent = (null !== $indent)
+ ? $this->getWhitespace($indent)
+ : $this->getIndent();
- /**
- * Is the script provided valid?
- *
- * @param mixed $value Is the given script valid?
- * @return bool
- */
- protected function isValid($value)
- {
- if ((!$value instanceof stdClass)
- || !isset($value->type)
- || (!isset($value->source) && !isset($value->attributes)))
- {
- return false;
+ if ($this->view) {
+ $useCdata = $this->view->plugin('doctype')->isXhtml() ? true : false;
+ } else {
+ $useCdata = $this->useCdata ? true : false;
}
- return true;
- }
+ $escapeStart = ($useCdata) ? '//<![CDATA[' : '//<!--';
+ $escapeEnd = ($useCdata) ? '//]]>' : '//-->';
- /**
- * Override append
- *
- * @param string $value Append script or file
- * @return void
- * @throws Exception\InvalidArgumentException
- */
- public function append($value)
- {
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException(
- 'Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()'
- );
+ $items = array();
+ $this->getContainer()->ksort();
+ foreach ($this as $item) {
+ if (!$this->isValid($item)) {
+ continue;
+ }
+
+ $items[] = $this->itemToString($item, $indent, $escapeStart, $escapeEnd);
}
- return $this->getContainer()->append($value);
+ return implode($this->getSeparator(), $items);
}
/**
- * Override prepend
+ * Start capture action
*
- * @param string $value Prepend script or file
+ * @param mixed $captureType Type of capture
+ * @param string $type Type of script
+ * @param array $attrs Attributes of capture
+ * @throws Exception\RuntimeException
* @return void
- * @throws Exception\InvalidArgumentException
*/
- public function prepend($value)
+ public function captureStart($captureType = Placeholder\Container\AbstractContainer::APPEND, $type = 'text/javascript', $attrs = array())
{
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException(
- 'Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()'
- );
+ if ($this->captureLock) {
+ throw new Exception\RuntimeException('Cannot nest headScript captures');
}
- return $this->getContainer()->prepend($value);
+ $this->captureLock = true;
+ $this->captureType = $captureType;
+ $this->captureScriptType = $type;
+ $this->captureScriptAttrs = $attrs;
+ ob_start();
}
/**
- * Override set
+ * End capture action and store
*
- * @param string $value Set script or file
* @return void
- * @throws Exception\InvalidArgumentException
*/
- public function set($value)
+ public function captureEnd()
{
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException(
- 'Invalid argument passed to set(); please use one of the helper methods, setScript() or setFile()'
- );
+ $content = ob_get_clean();
+ $type = $this->captureScriptType;
+ $attrs = $this->captureScriptAttrs;
+ $this->captureScriptType = null;
+ $this->captureScriptAttrs = null;
+ $this->captureLock = false;
+
+ switch ($this->captureType) {
+ case Placeholder\Container\AbstractContainer::SET:
+ case Placeholder\Container\AbstractContainer::PREPEND:
+ case Placeholder\Container\AbstractContainer::APPEND:
+ $action = strtolower($this->captureType) . 'Script';
+ break;
+ default:
+ $action = 'appendScript';
+ break;
}
- return $this->getContainer()->set($value);
+ $this->$action($content, $type, $attrs);
}
/**
- * Override offsetSet
+ * Create data item containing all necessary components of script
*
- * @param string|int $index Set script of file offset
- * @param mixed $value
- * @return void
- * @throws Exception\InvalidArgumentException
+ * @param string $type Type of data
+ * @param array $attributes Attributes of data
+ * @param string $content Content of data
+ * @return stdClass
*/
- public function offsetSet($index, $value)
+ public function createData($type, array $attributes, $content = null)
{
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException(
- 'Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()'
- );
- }
+ $data = new stdClass();
+ $data->type = $type;
+ $data->attributes = $attributes;
+ $data->source = $content;
- return $this->getContainer()->offsetSet($index, $value);
+ return $data;
}
/**
- * Set flag indicating if arbitrary attributes are allowed
+ * Is the file specified a duplicate?
*
- * @param bool $flag Set flag
- * @return \Zend\View\Helper\HeadScript
+ * @param string $file Name of file to check
+ * @return bool
*/
- public function setAllowArbitraryAttributes($flag)
+ protected function isDuplicate($file)
{
- $this->arbitraryAttributes = (bool) $flag;
- return $this;
+ foreach ($this->getContainer() as $item) {
+ if (($item->source === null)
+ && array_key_exists('src', $item->attributes)
+ && ($file == $item->attributes['src']))
+ {
+ return true;
+ }
+ }
+
+ return false;
}
/**
- * Are arbitrary attributes allowed?
+ * Is the script provided valid?
*
+ * @param mixed $value Is the given script valid?
* @return bool
*/
- public function arbitraryAttributesAllowed()
+ protected function isValid($value)
{
- return $this->arbitraryAttributes;
+ if ((!$value instanceof stdClass)
+ || !isset($value->type)
+ || (!isset($value->source) && !isset($value->attributes)))
+ {
+ return false;
+ }
+
+ return true;
}
/**
@@ -403,7 +383,6 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
}
}
-
$addScriptEscape = !(isset($item->attributes['noescape']) && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
$type = ($this->autoEscape) ? $this->escape($item->type) : $item->type;
@@ -438,54 +417,97 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
}
/**
- * Retrieve string representation
+ * Override append
*
- * @param string|int $indent Amount of whitespaces or string to use for indention
- * @return string
+ * @param string $value Append script or file
+ * @throws Exception\InvalidArgumentException
+ * @return void
*/
- public function toString($indent = null)
+ public function append($value)
{
- $indent = (null !== $indent)
- ? $this->getWhitespace($indent)
- : $this->getIndent();
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()'
+ );
+ }
- if ($this->view) {
- $useCdata = $this->view->plugin('doctype')->isXhtml() ? true : false;
- } else {
- $useCdata = $this->useCdata ? true : false;
+ return $this->getContainer()->append($value);
+ }
+
+ /**
+ * Override prepend
+ *
+ * @param string $value Prepend script or file
+ * @throws Exception\InvalidArgumentException
+ * @return void
+ */
+ public function prepend($value)
+ {
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()'
+ );
}
- $escapeStart = ($useCdata) ? '//<![CDATA[' : '//<!--';
- $escapeEnd = ($useCdata) ? '//]]>' : '//-->';
+ return $this->getContainer()->prepend($value);
+ }
- $items = array();
- $this->getContainer()->ksort();
- foreach ($this as $item) {
- if (!$this->isValid($item)) {
- continue;
- }
+ /**
+ * Override set
+ *
+ * @param string $value Set script or file
+ * @throws Exception\InvalidArgumentException
+ * @return void
+ */
+ public function set($value)
+ {
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid argument passed to set(); please use one of the helper methods, setScript() or setFile()'
+ );
+ }
- $items[] = $this->itemToString($item, $indent, $escapeStart, $escapeEnd);
+ return $this->getContainer()->set($value);
+ }
+
+ /**
+ * Override offsetSet
+ *
+ * @param string|int $index Set script of file offset
+ * @param mixed $value
+ * @throws Exception\InvalidArgumentException
+ * @return void
+ */
+ public function offsetSet($index, $value)
+ {
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()'
+ );
}
- $return = implode($this->getSeparator(), $items);
- return $return;
+ return $this->getContainer()->offsetSet($index, $value);
}
/**
- * Create data item containing all necessary components of script
+ * Set flag indicating if arbitrary attributes are allowed
*
- * @param string $type Type of data
- * @param array $attributes Attributes of data
- * @param string $content Content of data
- * @return stdClass
+ * @param bool $flag Set flag
+ * @return HeadScript
*/
- public function createData($type, array $attributes, $content = null)
+ public function setAllowArbitraryAttributes($flag)
{
- $data = new stdClass();
- $data->type = $type;
- $data->attributes = $attributes;
- $data->source = $content;
- return $data;
+ $this->arbitraryAttributes = (bool) $flag;
+ return $this;
+ }
+
+ /**
+ * Are arbitrary attributes allowed?
+ *
+ * @return bool
+ */
+ public function arbitraryAttributesAllowed()
+ {
+ return $this->arbitraryAttributes;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
index 3835e41e8620e9dda3e70feffefabdacf2bbaadd..66e2103e2598da504b6a3611961d9529d01eb402 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
@@ -20,18 +20,21 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
{
/**
* Registry key for placeholder
+ *
* @var string
*/
protected $regKey = 'Zend_View_Helper_HeadStyle';
/**
* Allowed optional attributes
+ *
* @var array
*/
protected $optionalAttributes = array('lang', 'title', 'media', 'dir');
/**
* Allowed media types
+ *
* @var array
*/
protected $mediaTypes = array(
@@ -41,18 +44,21 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
/**
* Capture type and/or attributes (used for hinting during capture)
+ *
* @var string
*/
protected $captureAttrs = null;
/**
* Capture lock
+ *
* @var bool
*/
protected $captureLock;
/**
* Capture type (append, prepend, set)
+ *
* @var string
*/
protected $captureType;
@@ -61,11 +67,11 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
* Constructor
*
* Set separator to PHP_EOL.
- *
*/
public function __construct()
{
parent::__construct();
+
$this->setSeparator(PHP_EOL);
}
@@ -74,10 +80,10 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
*
* Returns headStyle helper object; optionally, allows specifying
*
- * @param string $content Stylesheet contents
- * @param string $placement Append, prepend, or set
+ * @param string $content Stylesheet contents
+ * @param string $placement Append, prepend, or set
* @param string|array $attributes Optional attributes to utilize
- * @return \Zend\View\Helper\HeadStyle
+ * @return HeadStyle
*/
public function __invoke($content = null, $placement = 'APPEND', $attributes = array())
{
@@ -110,9 +116,9 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
* - setStyle($content, $attributes = array())
*
* @param string $method
- * @param array $args
- * @return void
+ * @param array $args
* @throws Exception\BadMethodCallException When no $content provided or invalid method
+ * @return void
*/
public function __call($method, $args)
{
@@ -156,101 +162,39 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
}
/**
- * Determine if a value is a valid style tag
- *
- * @param mixed $value
- * @return bool
- */
- protected function isValid($value)
- {
- if ((!$value instanceof stdClass)
- || !isset($value->content)
- || !isset($value->attributes))
- {
- return false;
- }
-
- return true;
- }
-
- /**
- * Override append to enforce style creation
- *
- * @param mixed $value
- * @return void
- * @throws Exception\InvalidArgumentException
- */
- public function append($value)
- {
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException(
- 'Invalid value passed to append; please use appendStyle()'
- );
- }
-
- return $this->getContainer()->append($value);
- }
-
- /**
- * Override offsetSet to enforce style creation
+ * Create string representation of placeholder
*
- * @param string|int $index
- * @param mixed $value
- * @return void
- * @throws Exception\InvalidArgumentException
+ * @param string|int $indent
+ * @return string
*/
- public function offsetSet($index, $value)
+ public function toString($indent = null)
{
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException(
- 'Invalid value passed to offsetSet; please use offsetSetStyle()'
- );
- }
-
- return $this->getContainer()->offsetSet($index, $value);
- }
+ $indent = (null !== $indent)
+ ? $this->getWhitespace($indent)
+ : $this->getIndent();
- /**
- * Override prepend to enforce style creation
- *
- * @param mixed $value
- * @return void
- * @throws Exception\InvalidArgumentException
- */
- public function prepend($value)
- {
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException(
- 'Invalid value passed to prepend; please use prependStyle()'
- );
+ $items = array();
+ $this->getContainer()->ksort();
+ foreach ($this as $item) {
+ if (!$this->isValid($item)) {
+ continue;
+ }
+ $items[] = $this->itemToString($item, $indent);
}
- return $this->getContainer()->prepend($value);
- }
-
- /**
- * Override set to enforce style creation
- *
- * @param mixed $value
- * @return void
- * @throws Exception\InvalidArgumentException
- */
- public function set($value)
- {
- if (!$this->isValid($value)) {
- throw new Exception\InvalidArgumentException('Invalid value passed to set; please use setStyle()');
- }
+ $return = $indent . implode($this->getSeparator() . $indent, $items);
+ $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
- return $this->getContainer()->set($value);
+ return $return;
}
/**
* Start capture action
*
- * @param string $type
- * @param string $attrs
- * @return void
+ * @param string $type
+ * @param string $attrs
* @throws Exception\RuntimeException
+ * @return void
*/
public function captureStart($type = Placeholder\Container\AbstractContainer::APPEND, $attrs = null)
{
@@ -290,11 +234,51 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
}
}
+ /**
+ * Create data item for use in stack
+ *
+ * @param string $content
+ * @param array $attributes
+ * @return stdClass
+ */
+ public function createData($content, array $attributes)
+ {
+ if (!isset($attributes['media'])) {
+ $attributes['media'] = 'screen';
+ } elseif (is_array($attributes['media'])) {
+ $attributes['media'] = implode(',', $attributes['media']);
+ }
+
+ $data = new stdClass();
+ $data->content = $content;
+ $data->attributes = $attributes;
+
+ return $data;
+ }
+
+ /**
+ * Determine if a value is a valid style tag
+ *
+ * @param mixed $value
+ * @return bool
+ */
+ protected function isValid($value)
+ {
+ if ((!$value instanceof stdClass)
+ || !isset($value->content)
+ || !isset($value->attributes))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
/**
* Convert content and attributes into valid style tag
*
- * @param stdClass $item Item to render
- * @param string $indent Indentation to use
+ * @param stdClass $item Item to render
+ * @param string $indent Indentation to use
* @return string
*/
public function itemToString(stdClass $item, $indent)
@@ -345,8 +329,8 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
}
$html = '<style type="text/css"' . $attrString . '>' . PHP_EOL
- . $escapeStart . $indent . $item->content . PHP_EOL . $escapeEnd
- . '</style>';
+ . $escapeStart . $indent . $item->content . PHP_EOL . $escapeEnd
+ . '</style>';
if (null == $escapeStart && null == $escapeEnd) {
$html = '<!--[if ' . $item->attributes['conditional'] . ']> ' . $html . '<![endif]-->';
@@ -356,50 +340,73 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
}
/**
- * Create string representation of placeholder
+ * Override append to enforce style creation
*
- * @param string|int $indent
- * @return string
+ * @param mixed $value
+ * @throws Exception\InvalidArgumentException
+ * @return void
*/
- public function toString($indent = null)
+ public function append($value)
{
- $indent = (null !== $indent)
- ? $this->getWhitespace($indent)
- : $this->getIndent();
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid value passed to append; please use appendStyle()'
+ );
+ }
- $items = array();
- $this->getContainer()->ksort();
- foreach ($this as $item) {
- if (!$this->isValid($item)) {
- continue;
- }
- $items[] = $this->itemToString($item, $indent);
+ return $this->getContainer()->append($value);
+ }
+
+ /**
+ * Override offsetSet to enforce style creation
+ *
+ * @param string|int $index
+ * @param mixed $value
+ * @throws Exception\InvalidArgumentException
+ * @return void
+ */
+ public function offsetSet($index, $value)
+ {
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid value passed to offsetSet; please use offsetSetStyle()'
+ );
}
- $return = $indent . implode($this->getSeparator() . $indent, $items);
- $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
- return $return;
+ return $this->getContainer()->offsetSet($index, $value);
}
/**
- * Create data item for use in stack
+ * Override prepend to enforce style creation
*
- * @param string $content
- * @param array $attributes
- * @return stdClass
+ * @param mixed $value
+ * @throws Exception\InvalidArgumentException
+ * @return void
*/
- public function createData($content, array $attributes)
+ public function prepend($value)
{
- if (!isset($attributes['media'])) {
- $attributes['media'] = 'screen';
- } elseif (is_array($attributes['media'])) {
- $attributes['media'] = implode(',', $attributes['media']);
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException(
+ 'Invalid value passed to prepend; please use prependStyle()'
+ );
}
- $data = new stdClass();
- $data->content = $content;
- $data->attributes = $attributes;
+ return $this->getContainer()->prepend($value);
+ }
- return $data;
+ /**
+ * Override set to enforce style creation
+ *
+ * @param mixed $value
+ * @throws Exception\InvalidArgumentException
+ * @return void
+ */
+ public function set($value)
+ {
+ if (!$this->isValid($value)) {
+ throw new Exception\InvalidArgumentException('Invalid value passed to set; please use setStyle()');
+ }
+
+ return $this->getContainer()->set($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
index 0ee0bdd757aec841df822b8313498de6a106c002..900ae5e146d96aa8651f3476e42f20b802069a04 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
@@ -21,6 +21,7 @@ class HeadTitle extends Placeholder\Container\AbstractStandalone implements
{
/**
* Registry key for placeholder
+ *
* @var string
*/
protected $regKey = 'Zend_View_Helper_HeadTitle';
@@ -58,7 +59,7 @@ class HeadTitle extends Placeholder\Container\AbstractStandalone implements
*
* @param string $title
* @param string $setType
- * @return \Zend\View\Helper\HeadTitle
+ * @return HeadTitle
*/
public function __invoke($title = null, $setType = null)
{
@@ -83,50 +84,29 @@ class HeadTitle extends Placeholder\Container\AbstractStandalone implements
}
/**
- * Set a default order to add titles
+ * Render title (wrapped by title tag)
*
- * @param string $setType
- * @return HeadTitle
- * @throws Exception\DomainException
+ * @param string|null $indent
+ * @return string
*/
- public function setDefaultAttachOrder($setType)
+ public function toString($indent = null)
{
- if (!in_array($setType, array(
- Placeholder\Container\AbstractContainer::APPEND,
- Placeholder\Container\AbstractContainer::SET,
- Placeholder\Container\AbstractContainer::PREPEND
- ))) {
- throw new Exception\DomainException(
- "You must use a valid attach order: 'PREPEND', 'APPEND' or 'SET'"
- );
- }
- $this->defaultAttachOrder = $setType;
+ $indent = (null !== $indent)
+ ? $this->getWhitespace($indent)
+ : $this->getIndent();
- return $this;
- }
+ $output = $this->renderTitle();
- /**
- * Get the default attach order, if any.
- *
- * @return mixed
- */
- public function getDefaultAttachOrder()
- {
- return $this->defaultAttachOrder;
+ return $indent . '<title>' . $output . '</title>';
}
/**
- * Turn helper into string
+ * Render title string
*
- * @param string|null $indent
* @return string
*/
- public function toString($indent = null)
+ public function renderTitle()
{
- $indent = (null !== $indent)
- ? $this->getWhitespace($indent)
- : $this->getIndent();
-
$items = array();
if (null !== ($translator = $this->getTranslator())) {
@@ -158,7 +138,40 @@ class HeadTitle extends Placeholder\Container\AbstractStandalone implements
$output = ($this->autoEscape) ? $this->escape($output) : $output;
- return $indent . '<title>' . $output . '</title>';
+ return $output;
+ }
+
+ /**
+ * Set a default order to add titles
+ *
+ * @param string $setType
+ * @throws Exception\DomainException
+ * @return HeadTitle
+ */
+ public function setDefaultAttachOrder($setType)
+ {
+ if (!in_array($setType, array(
+ Placeholder\Container\AbstractContainer::APPEND,
+ Placeholder\Container\AbstractContainer::SET,
+ Placeholder\Container\AbstractContainer::PREPEND
+ ))) {
+ throw new Exception\DomainException(
+ "You must use a valid attach order: 'PREPEND', 'APPEND' or 'SET'"
+ );
+ }
+ $this->defaultAttachOrder = $setType;
+
+ return $this;
+ }
+
+ /**
+ * Get the default attach order, if any.
+ *
+ * @return mixed
+ */
+ public function getDefaultAttachOrder()
+ {
+ return $this->defaultAttachOrder;
}
// Translator methods - Good candidate to refactor as a trait with PHP 5.4
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php
index 9728b7f07f244b1af76c0d3da26e0becc9d5912b..24bcb580f2e6f66f2e0d52f1cf102bc66cbb061b 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php
@@ -13,24 +13,21 @@ class HtmlFlash extends AbstractHtmlElement
{
/**
* Default file type for a flash applet
- *
*/
const TYPE = 'application/x-shockwave-flash';
/**
* Output a flash movie object tag
*
- * @param string $data The flash file
- * @param array $attribs Attribs for the object tag
- * @param array $params Params for in the object tag
- * @param string $content Alternative content
+ * @param string $data The flash file
+ * @param array $attribs Attribs for the object tag
+ * @param array $params Params for in the object tag
+ * @param string $content Alternative content
* @return string
*/
public function __invoke($data, array $attribs = array(), array $params = array(), $content = null)
{
- // Params
- $params = array_merge(array('movie' => $data,
- 'quality' => 'high'), $params);
+ $params = array_merge(array('movie' => $data, 'quality' => 'high'), $params);
$htmlObject = $this->getView()->plugin('htmlObject');
return $htmlObject($data, self::TYPE, $attribs, $params, $content);
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php
index e04e3626fc53bed8da26537341df92996eebe154..a1dc4ef51c6a2ceb76f0f4695fdaabec50ccd650 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php
@@ -17,10 +17,10 @@ class HtmlList extends AbstractHtmlElement
/**
* Generates a 'List' element.
*
- * @param array $items Array with the elements of the list
- * @param bool $ordered Specifies ordered/unordered list; default unordered
- * @param array $attribs Attributes for the ol/ul tag.
- * @param bool $escape Escape the items.
+ * @param array $items Array with the elements of the list
+ * @param bool $ordered Specifies ordered/unordered list; default unordered
+ * @param array $attribs Attributes for the ol/ul tag.
+ * @param bool $escape Escape the items.
* @return string The list XHTML.
*/
public function __invoke(array $items, $ordered = false, $attribs = false, $escape = true)
@@ -30,7 +30,7 @@ class HtmlList extends AbstractHtmlElement
foreach ($items as $item) {
if (!is_array($item)) {
if ($escape) {
- $escaper = $this->view->plugin('escapeHtml');
+ $escaper = $this->getView()->plugin('escapeHtml');
$item = $escaper($item);
}
$list .= '<li>' . $item . '</li>' . self::EOL;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php
index a28d14a5c786ecf794c8e6c29fa1f2042d8606df..0652d837ff96f227714f9bb8e4f3fd3e0d3bfb2c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php
@@ -16,13 +16,13 @@ class HtmlObject extends AbstractHtmlElement
/**
* Output an object set
*
- * @param string $data The data file
- * @param string $type Data file type
- * @param array $attribs Attribs for the object tag
- * @param array $params Params for in the object tag
- * @param string $content Alternative content for object
- * @return string
+ * @param string $data The data file
+ * @param string $type Data file type
+ * @param array $attribs Attribs for the object tag
+ * @param array $params Params for in the object tag
+ * @param string $content Alternative content for object
* @throws InvalidArgumentException
+ * @return string
*/
public function __invoke($data = null, $type = null, array $attribs = array(), array $params = array(), $content = null)
{
@@ -31,8 +31,7 @@ class HtmlObject extends AbstractHtmlElement
}
// Merge data and type
- $attribs = array_merge(array('data' => $data,
- 'type' => $type), $attribs);
+ $attribs = array_merge(array('data' => $data, 'type' => $type), $attribs);
// Params
$paramHtml = array();
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php
index 05ac23861aed2d727b8ce148aef791b34ff25dc4..f776260cc3932751e1d5b71ea305a3e553f34426 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php
@@ -13,13 +13,11 @@ class HtmlPage extends AbstractHtmlElement
{
/**
* Default file type for html
- *
*/
const TYPE = 'text/html';
/**
* Object classid
- *
*/
const ATTRIB_CLASSID = 'clsid:25336920-03F9-11CF-8FD0-00AA00686F13';
@@ -33,15 +31,15 @@ class HtmlPage extends AbstractHtmlElement
/**
* Output a html object tag
*
- * @param string $data The html url
- * @param array $attribs Attribs for the object tag
- * @param array $params Params for in the object tag
- * @param string $content Alternative content
+ * @param string $data The html url
+ * @param array $attribs Attribs for the object tag
+ * @param array $params Params for in the object tag
+ * @param string $content Alternative content
* @return string
*/
public function __invoke($data, array $attribs = array(), array $params = array(), $content = null)
{
- // Attrs
+ // Attribs
$attribs = array_merge($this->attribs, $attribs);
// Params
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php
index 852b3f3fd9123d6d15a378b79aa5ed7a87fa64bc..f2a3fe79be6aa80ab05ebe8f7643a29c5cc3594a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php
@@ -13,19 +13,16 @@ class HtmlQuicktime extends AbstractHtmlElement
{
/**
* Default file type for a movie applet
- *
*/
const TYPE = 'video/quicktime';
/**
* Object classid
- *
*/
const ATTRIB_CLASSID = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
/**
* Object Codebase
- *
*/
const ATTRIB_CODEBASE = 'http://www.apple.com/qtactivex/qtplugin.cab';
@@ -34,16 +31,15 @@ class HtmlQuicktime extends AbstractHtmlElement
*
* @var array
*/
- protected $attribs = array('classid' => self::ATTRIB_CLASSID,
- 'codebase' => self::ATTRIB_CODEBASE);
+ protected $attribs = array('classid' => self::ATTRIB_CLASSID, 'codebase' => self::ATTRIB_CODEBASE);
/**
* Output a quicktime movie object tag
*
- * @param string $data The quicktime file
- * @param array $attribs Attribs for the object tag
- * @param array $params Params for in the object tag
- * @param string $content Alternative content
+ * @param string $data The quicktime file
+ * @param array $attribs Attribs for the object tag
+ * @param array $params Params for in the object tag
+ * @param string $content Alternative content
* @return string
*/
public function __invoke($data, array $attribs = array(), array $params = array(), $content = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php
index 75c0a21d25665fee47011d89c48499dd974dd94a..b18015130dfbbb0c915425811f138d34297d8625 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php
@@ -18,43 +18,52 @@ use Zend\View\Exception;
class Identity extends AbstractHelper
{
/**
+ * AuthenticationService instance
+ *
* @var AuthenticationService
*/
protected $authenticationService;
/**
- * @return AuthenticationService
+ * Retrieve the current identity, if any.
+ *
+ * If none available, returns null.
+ *
+ * @throws Exception\RuntimeException
+ * @return mixed|null
*/
- public function getAuthenticationService()
+ public function __invoke()
{
- return $this->authenticationService;
+ if (!$this->authenticationService instanceof AuthenticationService) {
+ throw new Exception\RuntimeException('No AuthenticationService instance provided');
+ }
+
+ if (!$this->authenticationService->hasIdentity()) {
+ return null;
+ }
+
+ return $this->authenticationService->getIdentity();
}
/**
+ * Set AuthenticationService instance
+ *
* @param AuthenticationService $authenticationService
+ * @return Identity
*/
public function setAuthenticationService(AuthenticationService $authenticationService)
{
$this->authenticationService = $authenticationService;
+ return $this;
}
/**
- * Retrieve the current identity, if any.
- *
- * If none available, returns null.
+ * Get AuthenticationService instance
*
- * @return mixed|null
- * @throws Exception\RuntimeException
+ * @return AuthenticationService
*/
- public function __invoke()
+ public function getAuthenticationService()
{
- if (!$this->authenticationService instanceof AuthenticationService){
- throw new Exception\RuntimeException('No AuthenticationService instance provided');
- }
-
- if (!$this->authenticationService->hasIdentity()) {
- return null;
- }
- return $this->authenticationService->getIdentity();
+ return $this->authenticationService;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
index 009d501de7f894fbb735a8cc80e00b8e9f39da62..6c17f2a9f51f8d16d42b5a4b3426596ef70bdc55 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
@@ -17,6 +17,7 @@ class InlineScript extends HeadScript
{
/**
* Registry key for placeholder
+ *
* @var string
*/
protected $regKey = 'Zend_View_Helper_InlineScript';
@@ -27,12 +28,12 @@ class InlineScript extends HeadScript
* Returns InlineScript helper object; optionally, allows specifying a
* script or script file to include.
*
- * @param string $mode Script or file
- * @param string $spec Script/url
+ * @param string $mode Script or file
+ * @param string $spec Script/url
* @param string $placement Append, prepend, or set
- * @param array $attrs Array of script attributes
- * @param string $type Script type and/or array of script attributes
- * @return \Zend\View\Helper\InlineScript
+ * @param array $attrs Array of script attributes
+ * @param string $type Script type and/or array of script attributes
+ * @return InlineScript
*/
public function __invoke($mode = HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php
index db8572a9c30057bf755c473990f016a5fc2da3ca..b555e80f257a87f1f9297250a79b3d61ab7eebee 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php
@@ -22,18 +22,6 @@ class Json extends AbstractHelper
*/
protected $response;
- /**
- * Set the response object
- *
- * @param Response $response
- * @return Json
- */
- public function setResponse(Response $response)
- {
- $this->response = $response;
- return $this;
- }
-
/**
* Encode data as JSON and set response header
*
@@ -52,4 +40,16 @@ class Json extends AbstractHelper
return $data;
}
+
+ /**
+ * Set the response object
+ *
+ * @param Response $response
+ * @return Json
+ */
+ public function setResponse(Response $response)
+ {
+ $this->response = $response;
+ return $this;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php
index 91f8e55bbf334859fea5754957159d82fcf7283a..5b4dc47e352689e5d5d4b0d8485cda9564e5cbbd 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php
@@ -22,30 +22,6 @@ class Layout extends AbstractHelper
*/
protected $viewModelHelper;
- /**
- * Get layout template
- *
- * @return string
- */
- public function getLayout()
- {
- $model = $this->getRoot();
- return $model->getTemplate();
- }
-
- /**
- * Set layout template
- *
- * @param string $template
- * @return Layout
- */
- public function setTemplate($template)
- {
- $model = $this->getRoot();
- $model->setTemplate((string) $template);
- return $this;
- }
-
/**
* Set layout template or retrieve "layout" view model
*
@@ -60,9 +36,20 @@ class Layout extends AbstractHelper
if (null === $template) {
return $this->getRoot();
}
+
return $this->setTemplate($template);
}
+ /**
+ * Get layout template
+ *
+ * @return string
+ */
+ public function getLayout()
+ {
+ return $this->getRoot()->getTemplate();
+ }
+
/**
* Get the root view model
*
@@ -72,15 +59,29 @@ class Layout extends AbstractHelper
protected function getRoot()
{
$helper = $this->getViewModelHelper();
+
if (!$helper->hasRoot()) {
throw new Exception\RuntimeException(sprintf(
'%s: no view model currently registered as root in renderer',
__METHOD__
));
}
+
return $helper->getRoot();
}
+ /**
+ * Set layout template
+ *
+ * @param string $template
+ * @return Layout
+ */
+ public function setTemplate($template)
+ {
+ $this->getRoot()->setTemplate((string) $template);
+ return $this;
+ }
+
/**
* Retrieve the view model helper
*
@@ -88,11 +89,10 @@ class Layout extends AbstractHelper
*/
protected function getViewModelHelper()
{
- if ($this->viewModelHelper) {
- return $this->viewModelHelper;
+ if (null === $this->viewModelHelper) {
+ $this->viewModelHelper = $this->getView()->plugin('view_model');
}
- $view = $this->getView();
- $this->viewModelHelper = $view->plugin('view_model');
+
return $this->viewModelHelper;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php
index a0b78fef6e51e8bb3a64ed2b980737b3ced3b116..caf0f71e8b5ff12186bff3247564e3983a779402 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php
@@ -27,11 +27,6 @@ class Navigation extends AbstractNavigationHelper
*/
const NS = 'Zend\View\Helper\Navigation';
- /**
- * @var Navigation\PluginManager
- */
- protected $plugins;
-
/**
* Default proxy to use in {@link render()}
*
@@ -47,18 +42,18 @@ class Navigation extends AbstractNavigationHelper
protected $injected = array();
/**
- * Whether container should be injected when proxying
+ * Whether ACL should be injected when proxying
*
* @var bool
*/
- protected $injectContainer = true;
+ protected $injectAcl = true;
/**
- * Whether ACL should be injected when proxying
+ * Whether container should be injected when proxying
*
* @var bool
*/
- protected $injectAcl = true;
+ protected $injectContainer = true;
/**
* Whether translator should be injected when proxying
@@ -67,6 +62,11 @@ class Navigation extends AbstractNavigationHelper
*/
protected $injectTranslator = true;
+ /**
+ * @var Navigation\PluginManager
+ */
+ protected $plugins;
+
/**
* Helper entry point
*
@@ -97,15 +97,14 @@ class Navigation extends AbstractNavigationHelper
* $blogPages = $this->navigation()->findAllByRoute('blog');
* </code>
*
- * @param string $method helper name or method name in
- * container
+ * @param string $method helper name or method name in container
* @param array $arguments [optional] arguments to pass
- * @return mixed returns what the proxied call returns
* @throws \Zend\View\Exception\ExceptionInterface if proxying to a helper, and the
* helper is not an instance of the
* interface specified in
* {@link findHelper()}
* @throws \Zend\Navigation\Exception\ExceptionInterface if method does not exist in container
+ * @return mixed returns what the proxied call returns
*/
public function __call($method, array $arguments = array())
{
@@ -123,35 +122,15 @@ class Navigation extends AbstractNavigationHelper
}
/**
- * Set manager for retrieving navigation helpers
- *
- * @param Navigation\PluginManager $plugins
- * @return Navigation
- */
- public function setPluginManager(Navigation\PluginManager $plugins)
- {
- $renderer = $this->getView();
- if ($renderer) {
- $plugins->setRenderer($renderer);
- }
- $this->plugins = $plugins;
- return $this;
- }
-
- /**
- * Retrieve plugin loader for navigation helpers
- *
- * Lazy-loads an instance of Navigation\HelperLoader if none currently
- * registered.
+ * Renders helper
*
- * @return Navigation\PluginManager
+ * @param AbstractContainer $container
+ * @return string
+ * @throws Exception\RuntimeException
*/
- public function getPluginManager()
+ public function render($container = null)
{
- if (null === $this->plugins) {
- $this->setPluginManager(new Navigation\PluginManager());
- }
- return $this->plugins;
+ return $this->findHelper($this->getDefaultProxy())->render($container);
}
/**
@@ -160,14 +139,12 @@ class Navigation extends AbstractNavigationHelper
* The helper must implement the interface
* {@link Zend\View\Helper\Navigation\Helper}.
*
- * @param string $proxy helper name
- * @param bool $strict [optional] whether
- * exceptions should be
- * thrown if something goes
- * wrong. Default is true.
+ * @param string $proxy helper name
+ * @param bool $strict [optional] whether exceptions should be
+ * thrown if something goes
+ * wrong. Default is true.
+ * @throws Exception\RuntimeException if $strict is true and helper cannot be found
* @return \Zend\View\Helper\Navigation\HelperInterface helper instance
- * @throws Exception\RuntimeException if $strict is true and
- * helper cannot be found
*/
public function findHelper($proxy, $strict = true)
{
@@ -203,7 +180,7 @@ class Navigation extends AbstractNavigationHelper
* Injects container, ACL, and translator to the given $helper if this
* helper is configured to do so
*
- * @param NavigationHelper $helper helper instance
+ * @param NavigationHelper $helper helper instance
* @return void
*/
protected function inject(NavigationHelper $helper)
@@ -228,13 +205,11 @@ class Navigation extends AbstractNavigationHelper
}
}
- // Accessors:
-
/**
* Sets the default proxy to use in {@link render()}
*
- * @param string $proxy default proxy
- * @return \Zend\View\Helper\Navigation fluent interface, returns self
+ * @param string $proxy default proxy
+ * @return Navigation
*/
public function setDefaultProxy($proxy)
{
@@ -245,7 +220,7 @@ class Navigation extends AbstractNavigationHelper
/**
* Returns the default proxy to use in {@link render()}
*
- * @return string the default proxy to use in {@link render()}
+ * @return string
*/
public function getDefaultProxy()
{
@@ -255,10 +230,8 @@ class Navigation extends AbstractNavigationHelper
/**
* Sets whether container should be injected when proxying
*
- * @param bool $injectContainer [optional] whether container should
- * be injected when proxying. Default
- * is true.
- * @return \Zend\View\Helper\Navigation fluent interface, returns self
+ * @param bool $injectContainer
+ * @return Navigation
*/
public function setInjectContainer($injectContainer = true)
{
@@ -269,7 +242,7 @@ class Navigation extends AbstractNavigationHelper
/**
* Returns whether container should be injected when proxying
*
- * @return bool whether container should be injected when proxying
+ * @return bool
*/
public function getInjectContainer()
{
@@ -279,10 +252,8 @@ class Navigation extends AbstractNavigationHelper
/**
* Sets whether ACL should be injected when proxying
*
- * @param bool $injectAcl [optional] whether ACL should be
- * injected when proxying. Default is
- * true.
- * @return \Zend\View\Helper\Navigation fluent interface, returns self
+ * @param bool $injectAcl
+ * @return Navigation
*/
public function setInjectAcl($injectAcl = true)
{
@@ -293,7 +264,7 @@ class Navigation extends AbstractNavigationHelper
/**
* Returns whether ACL should be injected when proxying
*
- * @return bool whether ACL should be injected when proxying
+ * @return bool
*/
public function getInjectAcl()
{
@@ -303,10 +274,8 @@ class Navigation extends AbstractNavigationHelper
/**
* Sets whether translator should be injected when proxying
*
- * @param bool $injectTranslator [optional] whether translator should
- * be injected when proxying. Default
- * is true.
- * @return Navigation fluent interface, returns self
+ * @param bool $injectTranslator
+ * @return Navigation
*/
public function setInjectTranslator($injectTranslator = true)
{
@@ -317,28 +286,44 @@ class Navigation extends AbstractNavigationHelper
/**
* Returns whether translator should be injected when proxying
*
- * @return bool whether translator should be injected when proxying
+ * @return bool
*/
public function getInjectTranslator()
{
return $this->injectTranslator;
}
- // Zend\View\Helper\Navigation\Helper:
+ /**
+ * Set manager for retrieving navigation helpers
+ *
+ * @param Navigation\PluginManager $plugins
+ * @return Navigation
+ */
+ public function setPluginManager(Navigation\PluginManager $plugins)
+ {
+ $renderer = $this->getView();
+ if ($renderer) {
+ $plugins->setRenderer($renderer);
+ }
+ $this->plugins = $plugins;
+
+ return $this;
+ }
/**
- * Renders helper
+ * Retrieve plugin loader for navigation helpers
+ *
+ * Lazy-loads an instance of Navigation\HelperLoader if none currently
+ * registered.
*
- * @param \Zend\Navigation\AbstractContainer $container [optional] container to
- * render. Default is to
- * render the container
- * registered in the helper.
- * @return string helper output
- * @throws Exception\RuntimeException if helper cannot be found
+ * @return Navigation\PluginManager
*/
- public function render($container = null)
+ public function getPluginManager()
{
- $helper = $this->findHelper($this->getDefaultProxy());
- return $helper->render($container);
+ if (null === $this->plugins) {
+ $this->setPluginManager(new Navigation\PluginManager());
+ }
+
+ return $this->plugins;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php
index ff13c5919d40e61c98b08611af04c5e1c3abba05..b8c4ee53625b0644a4a7a0fca7ecf9f6972263c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php
@@ -10,6 +10,9 @@
namespace Zend\View\Helper\Navigation;
use RecursiveIteratorIterator;
+use Zend\EventManager\EventManager;
+use Zend\EventManager\EventManagerAwareInterface;
+use Zend\EventManager\EventManagerInterface;
use Zend\I18n\Translator\Translator;
use Zend\I18n\Translator\TranslatorAwareInterface;
use Zend\Navigation;
@@ -24,10 +27,16 @@ use Zend\View\Exception;
* Base class for navigational helpers
*/
abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
+ EventManagerAwareInterface,
HelperInterface,
ServiceLocatorAwareInterface,
TranslatorAwareInterface
{
+ /**
+ * @var EventManagerInterface
+ */
+ protected $events;
+
/**
* @var ServiceLocatorInterface
*/
@@ -127,60 +136,110 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
protected static $defaultRole;
/**
- * Set the service locator.
+ * Magic overload: Proxy calls to the navigation container
*
- * @param ServiceLocatorInterface $serviceLocator
- * @return AbstractHelper
+ * @param string $method method name in container
+ * @param array $arguments rguments to pass
+ * @return mixed
+ * @throws Navigation\Exception\ExceptionInterface
*/
- public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
+ public function __call($method, array $arguments = array())
{
- $this->serviceLocator = $serviceLocator;
- return $this;
+ return call_user_func_array(
+ array($this->getContainer(), $method),
+ $arguments);
}
/**
- * Get the service locator.
+ * Magic overload: Proxy to {@link render()}.
*
- * @return \Zend\ServiceManager\ServiceLocatorInterface
- */
- public function getServiceLocator()
- {
- return $this->serviceLocator;
- }
-
- /**
- * Sets navigation container the helper operates on by default
+ * This method will trigger an E_USER_ERROR if rendering the helper causes
+ * an exception to be thrown.
*
- * Implements {@link HelperInterface::setContainer()}.
+ * Implements {@link HelperInterface::__toString()}.
*
- * @param string|Navigation\AbstractContainer $container [optional] container to operate on.
- * Default is null, meaning container will be reset.
- * @return AbstractHelper fluent interface, returns self
+ * @return string
*/
- public function setContainer($container = null)
+ public function __toString()
{
- $this->parseContainer($container);
- $this->container = $container;
- return $this;
+ try {
+ return $this->render();
+ } catch (\Exception $e) {
+ $msg = get_class($e) . ': ' . $e->getMessage();
+ trigger_error($msg, E_USER_ERROR);
+ return '';
+ }
}
/**
- * Returns the navigation container helper operates on by default
- *
- * Implements {@link HelperInterface::getContainer()}.
- *
- * If no container is set, a new container will be instantiated and
- * stored in the helper.
+ * Finds the deepest active page in the given container
*
- * @return Navigation\AbstractContainer navigation container
+ * @param Navigation\AbstractContainer $container container to search
+ * @param int|null $minDepth [optional] minimum depth
+ * required for page to be
+ * valid. Default is to use
+ * {@link getMinDepth()}. A
+ * null value means no minimum
+ * depth required.
+ * @param int|null $maxDepth [optional] maximum depth
+ * a page can have to be
+ * valid. Default is to use
+ * {@link getMaxDepth()}. A
+ * null value means no maximum
+ * depth required.
+ * @return array an associative array with
+ * the values 'depth' and
+ * 'page', or an empty array
+ * if not found
*/
- public function getContainer()
+ public function findActive($container, $minDepth = null, $maxDepth = -1)
{
- if (null === $this->container) {
- $this->container = new Navigation\Navigation();
+ $this->parseContainer($container);
+ if (!is_int($minDepth)) {
+ $minDepth = $this->getMinDepth();
+ }
+ if ((!is_int($maxDepth) || $maxDepth < 0) && null !== $maxDepth) {
+ $maxDepth = $this->getMaxDepth();
}
- return $this->container;
+ $found = null;
+ $foundDepth = -1;
+ $iterator = new RecursiveIteratorIterator($container, RecursiveIteratorIterator::CHILD_FIRST);
+
+ foreach ($iterator as $page) {
+ $currDepth = $iterator->getDepth();
+ if ($currDepth < $minDepth || !$this->accept($page)) {
+ // page is not accepted
+ continue;
+ }
+
+ if ($page->isActive(false) && $currDepth > $foundDepth) {
+ // found an active page at a deeper level than before
+ $found = $page;
+ $foundDepth = $currDepth;
+ }
+ }
+
+ if (is_int($maxDepth) && $foundDepth > $maxDepth) {
+ while ($foundDepth > $maxDepth) {
+ if (--$foundDepth < $minDepth) {
+ $found = null;
+ break;
+ }
+
+ $found = $found->getParent();
+ if (!$found instanceof AbstractPage) {
+ $found = null;
+ break;
+ }
+ }
+ }
+
+ if ($found) {
+ return array('page' => $found, 'depth' => $foundDepth);
+ }
+
+ return array();
}
/**
@@ -226,84 +285,155 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
}
}
+ // Iterator filter methods:
+
/**
- * Sets the minimum depth a page must have to be included when rendering
+ * Determines whether a page should be accepted when iterating
+ *
+ * Default listener may be 'overridden' by attaching listener to 'isAllowed'
+ * method. Listener must be 'short circuited' if overriding default ACL
+ * listener.
+ *
+ * Rules:
+ * - If a page is not visible it is not accepted, unless RenderInvisible has
+ * been set to true
+ * - If $useAcl is true (default is true):
+ * - Page is accepted if listener returns true, otherwise false
+ * - If page is accepted and $recursive is true, the page
+ * will not be accepted if it is the descendant of a non-accepted page
*
- * @param int $minDepth [optional] minimum depth. Default is null, which
- * sets no minimum depth.
- * @return AbstractHelper fluent interface, returns self
+ * @param AbstractPage $page page to check
+ * @param bool $recursive [optional] if true, page will not be
+ * accepted if it is the descendant of
+ * a page that is not accepted. Default
+ * is true
+ *
+ * @return bool Whether page should be accepted
*/
- public function setMinDepth($minDepth = null)
+ public function accept(AbstractPage $page, $recursive = true)
{
- if (null === $minDepth || is_int($minDepth)) {
- $this->minDepth = $minDepth;
- } else {
- $this->minDepth = (int) $minDepth;
+ $accept = true;
+
+ if (!$page->isVisible(false) && !$this->getRenderInvisible()) {
+ $accept = false;
+ } elseif ($this->getUseAcl()) {
+ $acl = $this->getAcl();
+ $role = $this->getRole();
+ $params = array('acl' => $acl, 'page' => $page, 'role' => $role);
+ $accept = $this->isAllowed($params);
}
- return $this;
+
+ if ($accept && $recursive) {
+ $parent = $page->getParent();
+
+ if ($parent instanceof AbstractPage) {
+ $accept = $this->accept($parent, true);
+ }
+ }
+
+ return $accept;
}
/**
- * Returns minimum depth a page must have to be included when rendering
+ * Determines whether a page should be allowed given certain parameters
*
- * @return int|null minimum depth or null
+ * @param array $params
+ * @return bool
*/
- public function getMinDepth()
+ protected function isAllowed($params)
{
- if (!is_int($this->minDepth) || $this->minDepth < 0) {
- return 0;
- }
- return $this->minDepth;
+ $results = $this->getEventManager()->trigger(__FUNCTION__, $this, $params);
+ return $results->last();
}
+ // Util methods:
+
/**
- * Sets the maximum depth a page can have to be included when rendering
+ * Retrieve whitespace representation of $indent
*
- * @param int $maxDepth [optional] maximum depth. Default is null, which
- * sets no maximum depth.
- * @return AbstractHelper fluent interface, returns self
+ * @param int|string $indent
+ * @return string
*/
- public function setMaxDepth($maxDepth = null)
+ protected function getWhitespace($indent)
{
- if (null === $maxDepth || is_int($maxDepth)) {
- $this->maxDepth = $maxDepth;
- } else {
- $this->maxDepth = (int) $maxDepth;
+ if (is_int($indent)) {
+ $indent = str_repeat(' ', $indent);
}
- return $this;
+
+ return (string) $indent;
}
/**
- * Returns maximum depth a page can have to be included when rendering
+ * Converts an associative array to a string of tag attributes.
+ *
+ * Overloads {@link View\Helper\AbstractHtmlElement::htmlAttribs()}.
*
- * @return int|null maximum depth or null
+ * @param array $attribs an array where each key-value pair is converted
+ * to an attribute name and value
+ * @return string
*/
- public function getMaxDepth()
+ protected function htmlAttribs($attribs)
{
- return $this->maxDepth;
+ // filter out null values and empty string values
+ foreach ($attribs as $key => $value) {
+ if ($value === null || (is_string($value) && !strlen($value))) {
+ unset($attribs[$key]);
+ }
+ }
+
+ return parent::htmlAttribs($attribs);
}
/**
- * Set the indentation string for using in {@link render()}, optionally a
- * number of spaces to indent with
+ * Returns an HTML string containing an 'a' element for the given page
*
- * @param string|int $indent indentation string or number of spaces
- * @return AbstractHelper fluent interface, returns self
+ * @param AbstractPage $page page to generate HTML for
+ * @return string
*/
- public function setIndent($indent)
+ public function htmlify(AbstractPage $page)
{
- $this->indent = $this->getWhitespace($indent);
- return $this;
+ // get label and title for translating
+ $label = $page->getLabel();
+ $title = $page->getTitle();
+
+ if (null !== ($translator = $this->getTranslator())) {
+ $textDomain = $this->getTranslatorTextDomain();
+ if (is_string($label) && !empty($label)) {
+ $label = $translator->translate($label, $textDomain);
+ }
+ if (is_string($title) && !empty($title)) {
+ $title = $translator->translate($title, $textDomain);
+ }
+ }
+
+ // get attribs for anchor element
+ $attribs = array(
+ 'id' => $page->getId(),
+ 'title' => $title,
+ 'class' => $page->getClass(),
+ 'href' => $page->getHref(),
+ 'target' => $page->getTarget()
+ );
+
+ $escaper = $this->view->plugin('escapeHtml');
+
+ return '<a' . $this->htmlAttribs($attribs) . '>' . $escaper($label) . '</a>';
}
/**
- * Returns indentation
+ * Normalize an ID
+ *
+ * Overrides {@link View\Helper\AbstractHtmlElement::normalizeId()}.
*
+ * @param string $value
* @return string
*/
- public function getIndent()
+ protected function normalizeId($value)
{
- return $this->indent;
+ $prefix = get_class($this);
+ $prefix = strtolower(trim(substr($prefix, strrpos($prefix, '\\')), '\\'));
+
+ return $prefix . '-' . $value;
}
/**
@@ -311,8 +441,8 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
*
* Implements {@link HelperInterface::setAcl()}.
*
- * @param Acl\AclInterface $acl [optional] ACL object. Default is null.
- * @return AbstractHelper fluent interface, returns self
+ * @param Acl\AclInterface $acl ACL object.
+ * @return AbstractHelper
*/
public function setAcl(Acl\AclInterface $acl = null)
{
@@ -338,237 +468,250 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
}
/**
- * Sets ACL role(s) to use when iterating pages
+ * Checks if the helper has an ACL instance
*
- * Implements {@link HelperInterface::setRole()}.
+ * Implements {@link HelperInterface::hasAcl()}.
*
- * @param mixed $role [optional] role to set. Expects a string, an
- * instance of type {@link Acl\Role\RoleInterface}, or null. Default
- * is null, which will set no role.
- * @return AbstractHelper fluent interface, returns self
- * @throws Exception\InvalidArgumentException if $role is invalid
+ * @return bool
*/
- public function setRole($role = null)
+ public function hasAcl()
{
- if (null === $role || is_string($role) ||
- $role instanceof Acl\Role\RoleInterface
+ if ($this->acl instanceof Acl\Acl
+ || static::$defaultAcl instanceof Acl\Acl
) {
- $this->role = $role;
- } else {
- throw new Exception\InvalidArgumentException(sprintf(
- '$role must be a string, null, or an instance of '
- . 'Zend\Permissions\Role\RoleInterface; %s given',
- (is_object($role) ? get_class($role) : gettype($role))
- ));
+ return true;
}
- return $this;
+ return false;
}
/**
- * Returns ACL role to use when iterating pages, or null if it isn't set
- * using {@link setRole()} or {@link setDefaultRole()}
+ * Set the event manager.
*
- * Implements {@link HelperInterface::getRole()}.
+ * @param EventManagerInterface $events
+ * @return AbstractHelper
+ */
+ public function setEventManager(EventManagerInterface $events)
+ {
+ $events->setIdentifiers(array(
+ __CLASS__,
+ get_called_class(),
+ ));
+
+ $this->events = $events;
+
+ $this->setDefaultListeners();
+
+ return $this;
+ }
+
+ /**
+ * Get the event manager.
*
- * @return string|Acl\Role\RoleInterface|null role or null
+ * @return EventManagerInterface
*/
- public function getRole()
+ public function getEventManager()
{
- if ($this->role === null && static::$defaultRole !== null) {
- return static::$defaultRole;
+ if (null === $this->events) {
+ $this->setEventManager(new EventManager());
}
- return $this->role;
+ return $this->events;
}
/**
- * Sets whether ACL should be used
+ * Sets navigation container the helper operates on by default
*
- * Implements {@link HelperInterface::setUseAcl()}.
+ * Implements {@link HelperInterface::setContainer()}.
*
- * @param bool $useAcl [optional] whether ACL should be used. Default is true.
- * @return AbstractHelper fluent interface, returns self
+ * @param string|Navigation\AbstractContainer $container Default is null, meaning container will be reset.
+ * @return AbstractHelper
*/
- public function setUseAcl($useAcl = true)
+ public function setContainer($container = null)
{
- $this->useAcl = (bool) $useAcl;
+ $this->parseContainer($container);
+ $this->container = $container;
+
return $this;
}
/**
- * Returns whether ACL should be used
+ * Returns the navigation container helper operates on by default
*
- * Implements {@link HelperInterface::getUseAcl()}.
+ * Implements {@link HelperInterface::getContainer()}.
+ *
+ * If no container is set, a new container will be instantiated and
+ * stored in the helper.
*
- * @return bool whether ACL should be used
+ * @return Navigation\AbstractContainer navigation container
*/
- public function getUseAcl()
+ public function getContainer()
{
- return $this->useAcl;
+ if (null === $this->container) {
+ $this->container = new Navigation\Navigation();
+ }
+
+ return $this->container;
}
/**
- * Return renderInvisible flag
+ * Checks if the helper has a container
+ *
+ * Implements {@link HelperInterface::hasContainer()}.
*
* @return bool
*/
- public function getRenderInvisible()
+ public function hasContainer()
{
- return $this->renderInvisible;
+ return null !== $this->container;
}
/**
- * Render invisible items?
+ * Set the indentation string for using in {@link render()}, optionally a
+ * number of spaces to indent with
*
- * @param bool $renderInvisible [optional] boolean flag
- * @return AbstractHelper fluent interface returns self
+ * @param string|int $indent
+ * @return AbstractHelper
*/
- public function setRenderInvisible($renderInvisible = true)
+ public function setIndent($indent)
{
- $this->renderInvisible = (bool) $renderInvisible;
+ $this->indent = $this->getWhitespace($indent);
return $this;
}
- // Magic overloads:
-
/**
- * Magic overload: Proxy calls to the navigation container
+ * Returns indentation
*
- * @param string $method method name in container
- * @param array $arguments [optional] arguments to pass
- * @return mixed returns what the container returns
- * @throws Navigation\Exception\ExceptionInterface if method does not exist in container
+ * @return string
*/
- public function __call($method, array $arguments = array())
+ public function getIndent()
{
- return call_user_func_array(
- array($this->getContainer(), $method),
- $arguments);
+ return $this->indent;
}
/**
- * Magic overload: Proxy to {@link render()}.
- *
- * This method will trigger an E_USER_ERROR if rendering the helper causes
- * an exception to be thrown.
- *
- * Implements {@link HelperInterface::__toString()}.
+ * Sets the maximum depth a page can have to be included when rendering
*
- * @return string
+ * @param int $maxDepth Default is null, which sets no maximum depth.
+ * @return AbstractHelper
*/
- public function __toString()
+ public function setMaxDepth($maxDepth = null)
{
- try {
- return $this->render();
- } catch (\Exception $e) {
- $msg = get_class($e) . ': ' . $e->getMessage();
- trigger_error($msg, E_USER_ERROR);
- return '';
+ if (null === $maxDepth || is_int($maxDepth)) {
+ $this->maxDepth = $maxDepth;
+ } else {
+ $this->maxDepth = (int) $maxDepth;
}
+
+ return $this;
}
- // Public methods:
+ /**
+ * Returns maximum depth a page can have to be included when rendering
+ *
+ * @return int|null
+ */
+ public function getMaxDepth()
+ {
+ return $this->maxDepth;
+ }
/**
- * Finds the deepest active page in the given container
+ * Sets the minimum depth a page must have to be included when rendering
*
- * @param Navigation\AbstractContainer $container container to search
- * @param int|null $minDepth [optional] minimum depth
- * required for page to be
- * valid. Default is to use
- * {@link getMinDepth()}. A
- * null value means no minimum
- * depth required.
- * @param int|null $maxDepth [optional] maximum depth
- * a page can have to be
- * valid. Default is to use
- * {@link getMaxDepth()}. A
- * null value means no maximum
- * depth required.
- * @return array an associative array with
- * the values 'depth' and
- * 'page', or an empty array
- * if not found
+ * @param int $minDepth Default is null, which sets no minimum depth.
+ * @return AbstractHelper
*/
- public function findActive($container, $minDepth = null, $maxDepth = -1)
+ public function setMinDepth($minDepth = null)
{
- $this->parseContainer($container);
- if (!is_int($minDepth)) {
- $minDepth = $this->getMinDepth();
- }
- if ((!is_int($maxDepth) || $maxDepth < 0) && null !== $maxDepth) {
- $maxDepth = $this->getMaxDepth();
+ if (null === $minDepth || is_int($minDepth)) {
+ $this->minDepth = $minDepth;
+ } else {
+ $this->minDepth = (int) $minDepth;
}
- $found = null;
- $foundDepth = -1;
- $iterator = new RecursiveIteratorIterator($container, RecursiveIteratorIterator::CHILD_FIRST);
-
- foreach ($iterator as $page) {
- $currDepth = $iterator->getDepth();
- if ($currDepth < $minDepth || !$this->accept($page)) {
- // page is not accepted
- continue;
- }
+ return $this;
+ }
- if ($page->isActive(false) && $currDepth > $foundDepth) {
- // found an active page at a deeper level than before
- $found = $page;
- $foundDepth = $currDepth;
- }
+ /**
+ * Returns minimum depth a page must have to be included when rendering
+ *
+ * @return int|null
+ */
+ public function getMinDepth()
+ {
+ if (!is_int($this->minDepth) || $this->minDepth < 0) {
+ return 0;
}
- if (is_int($maxDepth) && $foundDepth > $maxDepth) {
- while ($foundDepth > $maxDepth) {
- if (--$foundDepth < $minDepth) {
- $found = null;
- break;
- }
-
- $found = $found->getParent();
- if (!$found instanceof AbstractPage) {
- $found = null;
- break;
- }
- }
- }
+ return $this->minDepth;
+ }
- if ($found) {
- return array('page' => $found, 'depth' => $foundDepth);
- }
+ /**
+ * Render invisible items?
+ *
+ * @param bool $renderInvisible
+ * @return AbstractHelper
+ */
+ public function setRenderInvisible($renderInvisible = true)
+ {
+ $this->renderInvisible = (bool) $renderInvisible;
+ return $this;
+ }
- return array();
+ /**
+ * Return renderInvisible flag
+ *
+ * @return bool
+ */
+ public function getRenderInvisible()
+ {
+ return $this->renderInvisible;
}
/**
- * Checks if the helper has a container
+ * Sets ACL role(s) to use when iterating pages
*
- * Implements {@link HelperInterface::hasContainer()}.
+ * Implements {@link HelperInterface::setRole()}.
*
- * @return bool whether the helper has a container or not
+ * @param mixed $role [optional] role to set. Expects a string, an
+ * instance of type {@link Acl\Role\RoleInterface}, or null. Default
+ * is null, which will set no role.
+ * @return AbstractHelper
+ * @throws Exception\InvalidArgumentException
*/
- public function hasContainer()
+ public function setRole($role = null)
{
- return null !== $this->container;
+ if (null === $role || is_string($role) ||
+ $role instanceof Acl\Role\RoleInterface
+ ) {
+ $this->role = $role;
+ } else {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '$role must be a string, null, or an instance of '
+ . 'Zend\Permissions\Role\RoleInterface; %s given',
+ (is_object($role) ? get_class($role) : gettype($role))
+ ));
+ }
+
+ return $this;
}
/**
- * Checks if the helper has an ACL instance
+ * Returns ACL role to use when iterating pages, or null if it isn't set
+ * using {@link setRole()} or {@link setDefaultRole()}
*
- * Implements {@link HelperInterface::hasAcl()}.
+ * Implements {@link HelperInterface::getRole()}.
*
- * @return bool whether the helper has a an ACL instance or not
+ * @return string|Acl\Role\RoleInterface|null
*/
- public function hasAcl()
+ public function getRole()
{
- if ($this->acl instanceof Acl\Acl
- || static::$defaultAcl instanceof Acl\Acl
- ) {
- return true;
+ if ($this->role === null && static::$defaultRole !== null) {
+ return static::$defaultRole;
}
- return false;
+ return $this->role;
}
/**
@@ -576,7 +719,7 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
*
* Implements {@link HelperInterface::hasRole()}.
*
- * @return bool whether the helper has a an ACL role or not
+ * @return bool
*/
public function hasRole()
{
@@ -592,41 +735,25 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
}
/**
- * Returns an HTML string containing an 'a' element for the given page
+ * Set the service locator.
*
- * @param AbstractPage $page page to generate HTML for
- * @return string HTML string for the given page
+ * @param ServiceLocatorInterface $serviceLocator
+ * @return AbstractHelper
*/
- public function htmlify(AbstractPage $page)
+ public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
{
- // get label and title for translating
- $label = $page->getLabel();
- $title = $page->getTitle();
-
- if (null !== ($translator = $this->getTranslator())) {
- $textDomain = $this->getTranslatorTextDomain();
- if (is_string($label) && !empty($label)) {
- $label = $translator->translate($label, $textDomain);
- }
- if (is_string($title) && !empty($title)) {
- $title = $translator->translate($title, $textDomain);
- }
- }
-
- // get attribs for anchor element
- $attribs = array(
- 'id' => $page->getId(),
- 'title' => $title,
- 'class' => $page->getClass(),
- 'href' => $page->getHref(),
- 'target' => $page->getTarget()
- );
-
- $escaper = $this->view->plugin('escapeHtml');
+ $this->serviceLocator = $serviceLocator;
+ return $this;
+ }
- return '<a' . $this->htmlAttribs($attribs) . '>'
- . $escaper($label)
- . '</a>';
+ /**
+ * Get the service locator.
+ *
+ * @return ServiceLocatorInterface
+ */
+ public function getServiceLocator()
+ {
+ return $this->serviceLocator;
}
// Translator methods - Good candidate to refactor as a trait with PHP 5.4
@@ -646,6 +773,7 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
if (null !== $textDomain) {
$this->setTranslatorTextDomain($textDomain);
}
+
return $this;
}
@@ -676,8 +804,7 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
/**
* Sets whether translator is enabled and should be used
*
- * @param bool $enabled [optional] whether translator should be used.
- * Default is true.
+ * @param bool $enabled
* @return AbstractHelper
*/
public function setTranslatorEnabled($enabled = true)
@@ -718,134 +845,30 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
return $this->translatorTextDomain;
}
- // Iterator filter methods:
-
/**
- * Determines whether a page should be accepted when iterating
- *
- * Rules:
- * - If a page is not visible it is not accepted, unless RenderInvisible has
- * been set to true.
- * - If helper has no ACL, page is accepted
- * - If helper has ACL, but no role, page is not accepted
- * - If helper has ACL and role:
- * - Page is accepted if it has no resource or privilege
- * - Page is accepted if ACL allows page's resource or privilege
- * - If page is accepted by the rules above and $recursive is true, the page
- * will not be accepted if it is the descendant of a non-accepted page.
- *
- * @param AbstractPage $page page to check
- * @param bool $recursive [optional] if true, page will not be
- * accepted if it is the descendant of a
- * page that is not accepted. Default is true.
- * @return bool whether page should be accepted
- */
- public function accept(AbstractPage $page, $recursive = true)
- {
- // accept by default
- $accept = true;
-
- if (!$page->isVisible(false) && !$this->getRenderInvisible()) {
- // don't accept invisible pages
- $accept = false;
- } elseif ($this->getUseAcl() && !$this->acceptAcl($page)) {
- // acl is not amused
- $accept = false;
- }
-
- if ($accept && $recursive) {
- $parent = $page->getParent();
- if ($parent instanceof AbstractPage) {
- $accept = $this->accept($parent, true);
- }
- }
-
- return $accept;
- }
-
- /**
- * Determines whether a page should be accepted by ACL when iterating
- *
- * Rules:
- * - If helper has no ACL, page is accepted
- * - If page has a resource or privilege defined, page is accepted
- * if the ACL allows access to it using the helper's role
- * - If page has no resource or privilege, page is accepted
- *
- * @param AbstractPage $page page to check
- * @return bool whether page is accepted by ACL
- */
- protected function acceptAcl(AbstractPage $page)
- {
- if (!$acl = $this->getAcl()) {
- // no acl registered means don't use acl
- return true;
- }
-
- $role = $this->getRole();
- $resource = $page->getResource();
- $privilege = $page->getPrivilege();
-
- if ($resource || $privilege) {
- // determine using helper role and page resource/privilege
- return $acl->hasResource($resource) && $acl->isAllowed($role, $resource, $privilege);
- }
-
- return true;
- }
-
- // Util methods:
-
- /**
- * Retrieve whitespace representation of $indent
- *
- * @param int|string $indent
- * @return string
- */
- protected function getWhitespace($indent)
- {
- if (is_int($indent)) {
- $indent = str_repeat(' ', $indent);
- }
-
- return (string) $indent;
- }
-
- /**
- * Converts an associative array to a string of tag attributes.
+ * Sets whether ACL should be used
*
- * Overloads {@link View\Helper\AbstractHtmlElement::htmlAttribs()}.
+ * Implements {@link HelperInterface::setUseAcl()}.
*
- * @param array $attribs an array where each key-value pair is converted
- * to an attribute name and value
- * @return string an attribute string
+ * @param bool $useAcl
+ * @return AbstractHelper
*/
- protected function htmlAttribs($attribs)
+ public function setUseAcl($useAcl = true)
{
- // filter out null values and empty string values
- foreach ($attribs as $key => $value) {
- if ($value === null || (is_string($value) && !strlen($value))) {
- unset($attribs[$key]);
- }
- }
-
- return parent::htmlAttribs($attribs);
+ $this->useAcl = (bool) $useAcl;
+ return $this;
}
/**
- * Normalize an ID
+ * Returns whether ACL should be used
*
- * Overrides {@link View\Helper\AbstractHtmlElement::normalizeId()}.
+ * Implements {@link HelperInterface::getUseAcl()}.
*
- * @param string $value
- * @return string
+ * @return bool
*/
- protected function normalizeId($value)
+ public function getUseAcl()
{
- $prefix = get_class($this);
- $prefix = strtolower(trim(substr($prefix, strrpos($prefix, '\\')), '\\'));
-
- return $prefix . '-' . $value;
+ return $this->useAcl;
}
// Static methods:
@@ -886,4 +909,20 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
));
}
}
+
+ /**
+ * Attaches default ACL listeners, if ACLs are in use
+ */
+ protected function setDefaultListeners()
+ {
+ if (!$this->getUseAcl()) {
+ return;
+ }
+
+ $this->getEventManager()->getSharedManager()->attach(
+ 'Zend\View\Helper\Navigation\AbstractHelper',
+ 'isAllowed',
+ array('Zend\View\Helper\Navigation\Listener\AclListener', 'accept')
+ );
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php
index e6ad13d710f5f95f81a12111d233a69932f5fba7..a52350ee90ffca1c92b5a1ca4a144f4e4361877b 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php
@@ -20,11 +20,11 @@ use Zend\View\Exception;
class Breadcrumbs extends AbstractHelper
{
/**
- * Breadcrumbs separator string
+ * Whether last page in breadcrumb should be hyperlinked
*
- * @var string
+ * @var bool
*/
- protected $separator = ' > ';
+ protected $linkLast = false;
/**
* The minimum depth a page must have to be included when rendering
@@ -34,18 +34,18 @@ class Breadcrumbs extends AbstractHelper
protected $minDepth = 1;
/**
- * Whether last page in breadcrumb should be hyperlinked
+ * Partial view script to use for rendering menu
*
- * @var bool
+ * @var string|array
*/
- protected $linkLast = false;
+ protected $partial;
/**
- * Partial view script to use for rendering menu
+ * Breadcrumbs separator string
*
- * @var string|array
+ * @var string
*/
- protected $partial;
+ protected $separator = ' > ';
/**
* Helper entry point
@@ -63,90 +63,31 @@ class Breadcrumbs extends AbstractHelper
}
/**
- * Sets breadcrumb separator
- *
- * @param string $separator separator string
- * @return Breadcrumbs fluent interface, returns self
- */
- public function setSeparator($separator)
- {
- if (is_string($separator)) {
- $this->separator = $separator;
- }
-
- return $this;
- }
-
- /**
- * Returns breadcrumb separator
- *
- * @return string breadcrumb separator
- */
- public function getSeparator()
- {
- return $this->separator;
- }
-
- /**
- * Sets whether last page in breadcrumbs should be hyperlinked
- *
- * @param bool $linkLast whether last page should be hyperlinked
- * @return Breadcrumbs fluent interface, returns self
- */
- public function setLinkLast($linkLast)
- {
- $this->linkLast = (bool) $linkLast;
- return $this;
- }
-
- /**
- * Returns whether last page in breadcrumbs should be hyperlinked
+ * Renders helper
*
- * @return bool whether last page in breadcrumbs should be hyperlinked
- */
- public function getLinkLast()
- {
- return $this->linkLast;
- }
-
- /**
- * Sets which partial view script to use for rendering menu
+ * Implements {@link HelperInterface::render()}.
*
- * @param string|array $partial partial view script or null. If an array is
- * given, it is expected to contain two
- * values; the partial view script to use,
- * and the module where the script can be
- * found.
- * @return Breadcrumbs fluent interface, returns self
+ * @param AbstractContainer $container [optional] container to render. Default is
+ * to render the container registered in the helper.
+ * @return string
*/
- public function setPartial($partial)
+ public function render($container = null)
{
- if (null === $partial || is_string($partial) || is_array($partial)) {
- $this->partial = $partial;
+ $partial = $this->getPartial();
+ if ($partial) {
+ return $this->renderPartial($container, $partial);
}
- return $this;
- }
-
- /**
- * Returns partial view script to use for rendering menu
- *
- * @return string|array|null
- */
- public function getPartial()
- {
- return $this->partial;
+ return $this->renderStraight($container);
}
- // Render methods:
-
/**
* Renders breadcrumbs by chaining 'a' elements with the separator
* registered in the helper
*
* @param AbstractContainer $container [optional] container to render. Default is
- * to render the container registered in the helper.
- * @return string helper output
+ * to render the container registered in the helper.
+ * @return string
*/
public function renderStraight($container = null)
{
@@ -179,8 +120,8 @@ class Breadcrumbs extends AbstractHelper
if ($parent instanceof AbstractPage) {
// prepend crumb to html
$html = $this->htmlify($parent)
- . $this->getSeparator()
- . $html;
+ . $this->getSeparator()
+ . $html;
}
if ($parent === $container) {
@@ -209,9 +150,9 @@ class Breadcrumbs extends AbstractHelper
* is expected to contain two values; the
* partial view script to use, and the module
* where the script can be found.
- * @return string helper output
* @throws Exception\RuntimeException if no partial provided
* @throws Exception\InvalidArgumentException if partial is invalid array
+ * @return string helper output
*/
public function renderPartial($container = null, $partial = null)
{
@@ -257,8 +198,8 @@ class Breadcrumbs extends AbstractHelper
if (count($partial) != 2) {
throw new Exception\InvalidArgumentException(
'Unable to render menu: A view partial supplied as '
- . 'an array must contain two values: partial view '
- . 'script and module where script can be found'
+ . 'an array must contain two values: partial view '
+ . 'script and module where script can be found'
);
}
@@ -270,24 +211,79 @@ class Breadcrumbs extends AbstractHelper
return $partialHelper($partial, $model);
}
- // Zend\View\Helper\Navigation\Helper:
+ /**
+ * Sets whether last page in breadcrumbs should be hyperlinked
+ *
+ * @param bool $linkLast whether last page should be hyperlinked
+ * @return Breadcrumbs
+ */
+ public function setLinkLast($linkLast)
+ {
+ $this->linkLast = (bool) $linkLast;
+ return $this;
+ }
/**
- * Renders helper
+ * Returns whether last page in breadcrumbs should be hyperlinked
*
- * Implements {@link HelperInterface::render()}.
+ * @return bool
+ */
+ public function getLinkLast()
+ {
+ return $this->linkLast;
+ }
+
+ /**
+ * Sets which partial view script to use for rendering menu
*
- * @param AbstractContainer $container [optional] container to render. Default is
- * to render the container registered in the helper.
- * @return string helper output
+ * @param string|array $partial partial view script or null. If an array is
+ * given, it is expected to contain two
+ * values; the partial view script to use,
+ * and the module where the script can be
+ * found.
+ * @return Breadcrumbs
*/
- public function render($container = null)
+ public function setPartial($partial)
{
- $partial = $this->getPartial();
- if ($partial) {
- return $this->renderPartial($container, $partial);
+ if (null === $partial || is_string($partial) || is_array($partial)) {
+ $this->partial = $partial;
}
- return $this->renderStraight($container);
+ return $this;
+ }
+
+ /**
+ * Returns partial view script to use for rendering menu
+ *
+ * @return string|array|null
+ */
+ public function getPartial()
+ {
+ return $this->partial;
+ }
+
+ /**
+ * Sets breadcrumb separator
+ *
+ * @param string $separator separator string
+ * @return Breadcrumbs
+ */
+ public function setSeparator($separator)
+ {
+ if (is_string($separator)) {
+ $this->separator = $separator;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Returns breadcrumb separator
+ *
+ * @return string breadcrumb separator
+ */
+ public function getSeparator()
+ {
+ return $this->separator;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php
index 6c607c882b0a837d2046d1162a9355477d4dec75..06a47f7e77a29c17c902c2b68dfd65b20472f0b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php
@@ -19,28 +19,30 @@ use Zend\View\Helper\HelperInterface as BaseHelperInterface;
interface HelperInterface extends BaseHelperInterface
{
/**
- * Sets navigation container the helper should operate on by default
+ * Magic overload: Should proxy to {@link render()}.
*
- * @param string|Navigation\AbstractContainer $container [optional] container to operate
- * on. Default is null, which
- * indicates that the container
- * should be reset.
- * @return HelperInterface fluent interface, returns self
+ * @return string
*/
- public function setContainer($container = null);
+ public function __toString();
/**
- * Returns the navigation container the helper operates on by default
+ * Renders helper
*
- * @return Navigation\AbstractContainer navigation container
+ * @param string|Navigation\AbstractContainer $container [optional] container to render.
+ * Default is null, which indicates
+ * that the helper should render
+ * the container returned by {@link
+ * getContainer()}.
+ * @return string helper output
+ * @throws \Zend\View\Exception\ExceptionInterface
*/
- public function getContainer();
+ public function render($container = null);
/**
* Sets ACL to use when iterating pages
*
* @param Acl\AclInterface $acl [optional] ACL instance
- * @return HelperInterface fluent interface, returns self
+ * @return HelperInterface
*/
public function setAcl(Acl\AclInterface $acl = null);
@@ -48,97 +50,94 @@ interface HelperInterface extends BaseHelperInterface
* Returns ACL or null if it isn't set using {@link setAcl()} or
* {@link setDefaultAcl()}
*
- * @return Acl\AclInterface|null ACL object or null
+ * @return Acl\AclInterface|null
*/
public function getAcl();
/**
- * Sets ACL role to use when iterating pages
- *
- * @param mixed $role [optional] role to set. Expects a string, an
- * instance of type {@link Acl\Role}, or null. Default
- * is null.
- * @throws \Zend\View\Exception\ExceptionInterface if $role is invalid
- * @return HelperInterface fluent interface, returns
- * self
- */
- public function setRole($role = null);
-
- /**
- * Returns ACL role to use when iterating pages, or null if it isn't set
+ * Checks if the helper has an ACL instance
*
- * @return string|Acl\Role\RoleInterface|null role or null
+ * @return bool
*/
- public function getRole();
+ public function hasAcl();
/**
- * Sets whether ACL should be used
+ * Sets navigation container the helper should operate on by default
*
- * @param bool $useAcl [optional] whether ACL should be used. Default is true.
- * @return HelperInterface fluent interface, returns self
+ * @param string|Navigation\AbstractContainer $container [optional] container to operate
+ * on. Default is null, which
+ * indicates that the container
+ * should be reset.
+ * @return HelperInterface
*/
- public function setUseAcl($useAcl = true);
+ public function setContainer($container = null);
/**
- * Returns whether ACL should be used
+ * Returns the navigation container the helper operates on by default
*
- * @return bool whether ACL should be used
+ * @return Navigation\AbstractContainer navigation container
*/
- public function getUseAcl();
+ public function getContainer();
/**
- * Return renderInvisible flag
+ * Checks if the helper has a container
*
* @return bool
*/
- public function getRenderInvisible();
+ public function hasContainer();
/**
* Render invisible items?
*
* @param bool $renderInvisible [optional] boolean flag
- * @return HelperInterface fluent interface returns self
+ * @return HelperInterface
*/
public function setRenderInvisible($renderInvisible = true);
/**
- * Checks if the helper has a container
+ * Return renderInvisible flag
*
- * @return bool whether the helper has a container or not
+ * @return bool
*/
- public function hasContainer();
+ public function getRenderInvisible();
/**
- * Checks if the helper has an ACL instance
+ * Sets ACL role to use when iterating pages
*
- * @return bool whether the helper has a an ACL instance or not
+ * @param mixed $role [optional] role to set. Expects a string, an
+ * instance of type {@link Acl\Role}, or null. Default
+ * is null.
+ * @throws \Zend\View\Exception\ExceptionInterface if $role is invalid
+ * @return HelperInterface
*/
- public function hasAcl();
+ public function setRole($role = null);
+
+ /**
+ * Returns ACL role to use when iterating pages, or null if it isn't set
+ *
+ * @return string|Acl\Role\RoleInterface|null
+ */
+ public function getRole();
/**
* Checks if the helper has an ACL role
*
- * @return bool whether the helper has a an ACL role or not
+ * @return bool
*/
public function hasRole();
/**
- * Magic overload: Should proxy to {@link render()}.
+ * Sets whether ACL should be used
*
- * @return string
+ * @param bool $useAcl [optional] whether ACL should be used. Default is true.
+ * @return HelperInterface
*/
- public function __toString();
+ public function setUseAcl($useAcl = true);
/**
- * Renders helper
+ * Returns whether ACL should be used
*
- * @param string|Navigation\AbstractContainer $container [optional] container to render.
- * Default is null, which indicates
- * that the helper should render
- * the container returned by {@link
- * getContainer()}.
- * @return string helper output
- * @throws \Zend\View\Exception\ExceptionInterface if unable to render
+ * @return bool
*/
- public function render($container = null);
+ public function getUseAcl();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php
index 3e70fa4c2a20f930b1e2a070b243d1cbe71fc7e4..a974586e2605b5dfa26d38e3a00eaa4ebe0c6dbc 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php
@@ -23,7 +23,7 @@ use Zend\View\Exception;
*/
class Links extends AbstractHelper
{
- /**#@+
+ /**
* Constants used for specifying which link types to find and render
*
* @var int
@@ -45,7 +45,6 @@ class Links extends AbstractHelper
const RENDER_BOOKMARK = 0x4000;
const RENDER_CUSTOM = 0x8000;
const RENDER_ALL = 0xffff;
- /**#@+**/
/**
* Maps render constants to W3C link types
@@ -86,7 +85,6 @@ class Links extends AbstractHelper
* the {@link render()} method.
*
* @see _findRoot()
- *
* @var AbstractContainer
*/
protected $root;
@@ -117,10 +115,10 @@ class Links extends AbstractHelper
* $h->findRelFoo($page); // $h->findRelation($page, 'rel', 'foo');
* </code>
*
- * @param string $method method name
- * @param array $arguments method arguments
+ * @param string $method
+ * @param array $arguments
* @return mixed
- * @throws Exception\ExceptionInterface if method does not exist in container
+ * @throws Exception\ExceptionInterface
*/
public function __call($method, array $arguments = array())
{
@@ -137,47 +135,92 @@ class Links extends AbstractHelper
}
/**
- * Sets the helper's render flag
- *
- * The helper uses the bitwise '&' operator against the hex values of the
- * render constants. This means that the flag can is "bitwised" value of
- * the render constants. Examples:
- * <code>
- * // render all links except glossary
- * $flag = Links:RENDER_ALL ^ Links:RENDER_GLOSSARY;
- * $helper->setRenderFlag($flag);
- *
- * // render only chapters and sections
- * $flag = Links:RENDER_CHAPTER | Links:RENDER_SECTION;
- * $helper->setRenderFlag($flag);
- *
- * // render only relations that are not native W3C relations
- * $helper->setRenderFlag(Links:RENDER_CUSTOM);
- *
- * // render all relations (default)
- * $helper->setRenderFlag(Links:RENDER_ALL);
- * </code>
+ * Renders helper
*
- * Note that custom relations can also be rendered directly using the
- * {@link renderLink()} method.
+ * Implements {@link HelperInterface::render()}.
*
- * @param int $renderFlag render flag
- * @return Links fluent interface, returns self
+ * @param AbstractContainer|string|null $container [optional] container to render.
+ * Default is to render the
+ * container registered in the
+ * helper.
+ * @return string
*/
- public function setRenderFlag($renderFlag)
+ public function render($container = null)
{
- $this->renderFlag = (int) $renderFlag;
- return $this;
+ $this->parseContainer($container);
+ if (null === $container) {
+ $container = $this->getContainer();
+ }
+
+ $active = $this->findActive($container);
+ if ($active) {
+ $active = $active['page'];
+ } else {
+ // no active page
+ return '';
+ }
+
+ $output = '';
+ $indent = $this->getIndent();
+ $this->root = $container;
+
+ $result = $this->findAllRelations($active, $this->getRenderFlag());
+ foreach ($result as $attrib => $types) {
+ foreach ($types as $relation => $pages) {
+ foreach ($pages as $page) {
+ $r = $this->renderLink($page, $attrib, $relation);
+ if ($r) {
+ $output .= $indent . $r . self::EOL;
+ }
+ }
+ }
+ }
+
+ $this->root = null;
+
+ // return output (trim last newline by spec)
+ return strlen($output) ? rtrim($output, self::EOL) : '';
}
/**
- * Returns the helper's render flag
+ * Renders the given $page as a link element, with $attrib = $relation
*
- * @return int render flag
+ * @param AbstractPage $page the page to render the link for
+ * @param string $attrib the attribute to use for $type,
+ * either 'rel' or 'rev'
+ * @param string $relation relation type, muse be one of;
+ * alternate, appendix, bookmark,
+ * chapter, contents, copyright,
+ * glossary, help, home, index, next,
+ * prev, section, start, stylesheet,
+ * subsection
+ * @return string
+ * @throws Exception\DomainException
*/
- public function getRenderFlag()
+ public function renderLink(AbstractPage $page, $attrib, $relation)
{
- return $this->renderFlag;
+ if (!in_array($attrib, array('rel', 'rev'))) {
+ throw new Exception\DomainException(sprintf(
+ 'Invalid relation attribute "%s", must be "rel" or "rev"',
+ $attrib
+ ));
+ }
+
+ if (!$href = $page->getHref()) {
+ return '';
+ }
+
+ // TODO: add more attribs
+ // http://www.w3.org/TR/html401/struct/links.html#h-12.2
+ $attribs = array(
+ $attrib => $relation,
+ 'href' => $href,
+ 'title' => $page->getLabel()
+ );
+
+ return '<link' .
+ $this->htmlAttribs($attribs) .
+ $this->getClosingBracket();
}
// Finder methods:
@@ -203,8 +246,8 @@ class Links extends AbstractHelper
* </code>
*
* @param AbstractPage $page page to find links for
- * @param null|int $flag
- * @return array related pages
+ * @param null|int
+ * @return array
*/
public function findAllRelations(AbstractPage $page, $flag = null)
{
@@ -246,10 +289,10 @@ class Links extends AbstractHelper
* This method will first look for relations in the page instance, then
* by searching the root container if nothing was found in the page.
*
- * @param AbstractPage $page page to find relations for
- * @param string $rel relation, "rel" or "rev"
- * @param string $type link type, e.g. 'start', 'next'
- * @return AbstractPage|array|null page(s), or null if not found
+ * @param AbstractPage $page page to find relations for
+ * @param string $rel relation, "rel" or "rev"
+ * @param string $type link type, e.g. 'start', 'next'
+ * @return AbstractPage|array|null
* @throws Exception\DomainException if $rel is not "rel" or "rev"
*/
public function findRelation(AbstractPage $page, $rel, $type)
@@ -272,10 +315,10 @@ class Links extends AbstractHelper
* Finds relations of given $type for $page by checking if the
* relation is specified as a property of $page
*
- * @param AbstractPage $page page to find relations for
- * @param string $rel relation, 'rel' or 'rev'
- * @param string $type link type, e.g. 'start', 'next'
- * @return AbstractPage|array|null page(s), or null if not found
+ * @param AbstractPage $page page to find relations for
+ * @param string $rel relation, 'rel' or 'rev'
+ * @param string $type link type, e.g. 'start', 'next'
+ * @return AbstractPage|array|null
*/
protected function findFromProperty(AbstractPage $page, $rel, $type)
{
@@ -305,10 +348,10 @@ class Links extends AbstractHelper
* Finds relations of given $rel=$type for $page by using the helper to
* search for the relation in the root container
*
- * @param AbstractPage $page page to find relations for
- * @param string $rel relation, 'rel' or 'rev'
- * @param string $type link type, e.g. 'start', 'next', etc
- * @return array|null array of pages, or null if not found
+ * @param AbstractPage $page page to find relations for
+ * @param string $rel relation, 'rel' or 'rev'
+ * @param string $type link type, e.g. 'start', 'next', etc
+ * @return array|null
*/
protected function findFromSearch(AbstractPage $page, $rel, $type)
{
@@ -333,8 +376,8 @@ class Links extends AbstractHelper
* tells search engines which document is considered by the author to be the
* starting point of the collection.
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|null page or null
+ * @param AbstractPage $page
+ * @return AbstractPage|null
*/
public function searchRelStart(AbstractPage $page)
{
@@ -360,8 +403,8 @@ class Links extends AbstractHelper
* agents may choose to preload the "next" document, to reduce the perceived
* load time.
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|null page(s) or null
+ * @param AbstractPage $page
+ * @return AbstractPage|null
*/
public function searchRelNext(AbstractPage $page)
{
@@ -393,8 +436,8 @@ class Links extends AbstractHelper
* Refers to the previous document in an ordered series of documents. Some
* user agents also support the synonym "Previous".
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|null page or null
+ * @param AbstractPage $page
+ * @return AbstractPage|null
*/
public function searchRelPrev(AbstractPage $page)
{
@@ -425,8 +468,8 @@ class Links extends AbstractHelper
* From {@link http://www.w3.org/TR/html4/types.html#type-links}:
* Refers to a document serving as a chapter in a collection of documents.
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|array|null page(s) or null
+ * @param AbstractPage $page
+ * @return AbstractPage|array|null
*/
public function searchRelChapter(AbstractPage $page)
{
@@ -467,8 +510,8 @@ class Links extends AbstractHelper
* From {@link http://www.w3.org/TR/html4/types.html#type-links}:
* Refers to a document serving as a section in a collection of documents.
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|array|null page(s) or null
+ * @param AbstractPage $page
+ * @return AbstractPage|array|null
*/
public function searchRelSection(AbstractPage $page)
{
@@ -501,8 +544,8 @@ class Links extends AbstractHelper
* Refers to a document serving as a subsection in a collection of
* documents.
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|array|null page(s) or null
+ * @param AbstractPage $page
+ * @return AbstractPage|array|null
*/
public function searchRelSubsection(AbstractPage $page)
{
@@ -539,8 +582,8 @@ class Links extends AbstractHelper
* From {@link http://www.w3.org/TR/html4/types.html#type-links}:
* Refers to a document serving as a section in a collection of documents.
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|null page(s) or null
+ * @param AbstractPage $page
+ * @return AbstractPage|null
*/
public function searchRevSection(AbstractPage $page)
{
@@ -564,8 +607,8 @@ class Links extends AbstractHelper
* Refers to a document serving as a subsection in a collection of
* documents.
*
- * @param AbstractPage $page page to find relation for
- * @return AbstractPage|null page(s) or null
+ * @param AbstractPage $page
+ * @return AbstractPage|null
*/
public function searchRevSubsection(AbstractPage $page)
{
@@ -596,8 +639,8 @@ class Links extends AbstractHelper
* makes sure finder methods will not traverse above the container given
* to the render method.
*
- * @param AbstractPage $page page to find root for
- * @return AbstractContainer the root container of the given page
+ * @param AbstractPage $page
+ * @return AbstractContainer
*/
protected function findRoot(AbstractPage $page)
{
@@ -622,10 +665,10 @@ class Links extends AbstractHelper
/**
* Converts a $mixed value to an array of pages
*
- * @param mixed $mixed mixed value to get page(s) from
- * @param bool $recursive whether $value should be looped
- * if it is an array or a config
- * @return AbstractPage|array|null empty if unable to convert
+ * @param mixed $mixed mixed value to get page(s) from
+ * @param bool $recursive whether $value should be looped
+ * if it is an array or a config
+ * @return AbstractPage|array|null
*/
protected function convertToPages($mixed, $recursive = true)
{
@@ -674,96 +717,48 @@ class Links extends AbstractHelper
return null;
}
- // Render methods:
-
/**
- * Renders the given $page as a link element, with $attrib = $relation
+ * Sets the helper's render flag
+ *
+ * The helper uses the bitwise '&' operator against the hex values of the
+ * render constants. This means that the flag can is "bitwised" value of
+ * the render constants. Examples:
+ * <code>
+ * // render all links except glossary
+ * $flag = Links:RENDER_ALL ^ Links:RENDER_GLOSSARY;
+ * $helper->setRenderFlag($flag);
+ *
+ * // render only chapters and sections
+ * $flag = Links:RENDER_CHAPTER | Links:RENDER_SECTION;
+ * $helper->setRenderFlag($flag);
+ *
+ * // render only relations that are not native W3C relations
+ * $helper->setRenderFlag(Links:RENDER_CUSTOM);
+ *
+ * // render all relations (default)
+ * $helper->setRenderFlag(Links:RENDER_ALL);
+ * </code>
+ *
+ * Note that custom relations can also be rendered directly using the
+ * {@link renderLink()} method.
*
- * @param AbstractPage $page the page to render the link for
- * @param string $attrib the attribute to use for $type,
- * either 'rel' or 'rev'
- * @param string $relation relation type, muse be one of;
- * alternate, appendix, bookmark,
- * chapter, contents, copyright,
- * glossary, help, home, index, next,
- * prev, section, start, stylesheet,
- * subsection
- * @return string rendered link element
- * @throws Exception\DomainException if $attrib is invalid
+ * @param int $renderFlag
+ * @return Links
*/
- public function renderLink(AbstractPage $page, $attrib, $relation)
+ public function setRenderFlag($renderFlag)
{
- if (!in_array($attrib, array('rel', 'rev'))) {
- throw new Exception\DomainException(sprintf(
- 'Invalid relation attribute "%s", must be "rel" or "rev"',
- $attrib
- ));
- }
-
- if (!$href = $page->getHref()) {
- return '';
- }
-
- // TODO: add more attribs
- // http://www.w3.org/TR/html401/struct/links.html#h-12.2
- $attribs = array(
- $attrib => $relation,
- 'href' => $href,
- 'title' => $page->getLabel()
- );
+ $this->renderFlag = (int) $renderFlag;
- return '<link' .
- $this->htmlAttribs($attribs) .
- $this->getClosingBracket();
+ return $this;
}
- // Zend\View\Helper\Navigation\Helper:
-
/**
- * Renders helper
- *
- * Implements {@link HelperInterface::render()}.
+ * Returns the helper's render flag
*
- * @param AbstractContainer|string|null $container [optional] container to render.
- * Default is to render the
- * container registered in the
- * helper.
- * @return string helper output
+ * @return int
*/
- public function render($container = null)
+ public function getRenderFlag()
{
- $this->parseContainer($container);
- if (null === $container) {
- $container = $this->getContainer();
- }
-
- $active = $this->findActive($container);
- if ($active) {
- $active = $active['page'];
- } else {
- // no active page
- return '';
- }
-
- $output = '';
- $indent = $this->getIndent();
- $this->root = $container;
-
- $result = $this->findAllRelations($active, $this->getRenderFlag());
- foreach ($result as $attrib => $types) {
- foreach ($types as $relation => $pages) {
- foreach ($pages as $page) {
- $r = $this->renderLink($page, $attrib, $relation);
- if ($r) {
- $output .= $indent . $r . self::EOL;
- }
- }
- }
- }
-
- $this->root = null;
-
- // return output (trim last newline by spec)
- return strlen($output) ? rtrim($output, self::EOL) : '';
+ return $this->renderFlag;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b3e766c66b9852cdc88b7f03a16a85386fd7690
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\View\Helper\Navigation\Listener;
+
+use Zend\EventManager\Event;
+
+/**
+ * Default Access Control Listener
+ */
+class AclListener
+{
+ /**
+ * Determines whether a page should be accepted by ACL when iterating
+ *
+ * - If helper has no ACL, page is accepted
+ * - If page has a resource or privilege defined, page is accepted if the
+ * ACL allows access to it using the helper's role
+ * - If page has no resource or privilege, page is accepted
+ * - If helper has ACL and role:
+ * - Page is accepted if it has no resource or privilege.
+ * - Page is accepted if ACL allows page's resource or privilege.
+ *
+ * @param Event $event
+ * @return bool
+ */
+ public static function accept(Event $event)
+ {
+ $accepted = true;
+ $params = $event->getParams();
+ $acl = $params['acl'];
+ $page = $params['page'];
+ $role = $params['role'];
+
+ if (!$acl) {
+ return $accepted;
+ }
+
+ $resource = $page->getResource();
+ $privilege = $page->getPrivilege();
+
+ if ($resource || $privilege) {
+ $accepted = $acl->hasResource($resource)
+ && $acl->isAllowed($role, $resource, $privilege);
+ }
+
+ return $accepted;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
index e56864ad8178190acfddc1f3791a6fecb3ccccfb..02ddff7fc58962b12c9b165f5b91ae8158fbc71d 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
@@ -21,18 +21,11 @@ use Zend\View\Exception;
class Menu extends AbstractHelper
{
/**
- * CSS class to use for the ul element
- *
- * @var string
- */
- protected $ulClass = 'navigation';
-
- /**
- * Whether only active branch should be rendered
+ * Whether page class should be applied to <li> element
*
* @var bool
*/
- protected $onlyActiveBranch = false;
+ protected $addClassToListItem = false;
/**
* Whether labels should be escaped
@@ -42,11 +35,11 @@ class Menu extends AbstractHelper
protected $escapeLabels = true;
/**
- * Whether parents should be rendered when only rendering active branch
+ * Whether only active branch should be rendered
*
* @var bool
*/
- protected $renderParents = true;
+ protected $onlyActiveBranch = false;
/**
* Partial view script to use for rendering menu
@@ -56,273 +49,82 @@ class Menu extends AbstractHelper
protected $partial = null;
/**
- * View helper entry point:
- * Retrieves helper and optionally sets container to operate on
- *
- * @param AbstractContainer $container [optional] container to operate on
- * @return Menu fluent interface, returns self
- */
- public function __invoke($container = null)
- {
- if (null !== $container) {
- $this->setContainer($container);
- }
-
- return $this;
- }
-
- /**
- * Sets CSS class to use for the first 'ul' element when rendering
- *
- * @param string $ulClass CSS class to set
- * @return Menu fluent interface, returns self
- */
- public function setUlClass($ulClass)
- {
- if (is_string($ulClass)) {
- $this->ulClass = $ulClass;
- }
-
- return $this;
- }
-
- /**
- * Returns CSS class to use for the first 'ul' element when rendering
- *
- * @return string CSS class
- */
- public function getUlClass()
- {
- return $this->ulClass;
- }
-
- /**
- * Sets a flag indicating whether only active branch should be rendered
- *
- * @param bool $flag [optional] render only active branch. Default is true.
- * @return Menu fluent interface, returns self
- */
- public function setOnlyActiveBranch($flag = true)
- {
- $this->onlyActiveBranch = (bool) $flag;
- return $this;
- }
-
- /**
- * Returns a flag indicating whether only active branch should be rendered
- *
- * By default, this value is false, meaning the entire menu will be
- * be rendered.
- *
- * @return bool whether only active branch should be rendered
- */
- public function getOnlyActiveBranch()
- {
- return $this->onlyActiveBranch;
- }
-
- /**
- * Sets a flag indicating whether labels should be escaped
- *
- * @param bool $flag [optional] escape labels. Default is true.
- * @return Menu fluent interface, returns self
- */
- public function escapeLabels($flag = true)
- {
- $this->escapeLabels = (bool) $flag;
- return $this;
- }
-
- /**
- * Enables/disables rendering of parents when only rendering active branch
- *
- * See {@link setOnlyActiveBranch()} for more information.
+ * Whether parents should be rendered when only rendering active branch
*
- * @param bool $flag [optional] render parents when rendering active branch.
- * Default is true.
- * @return Menu fluent interface, returns self
+ * @var bool
*/
- public function setRenderParents($flag = true)
- {
- $this->renderParents = (bool) $flag;
- return $this;
- }
+ protected $renderParents = true;
/**
- * Returns flag indicating whether parents should be rendered when rendering
- * only the active branch
- *
- * By default, this value is true.
+ * CSS class to use for the ul element
*
- * @return bool whether parents should be rendered
+ * @var string
*/
- public function getRenderParents()
- {
- return $this->renderParents;
- }
+ protected $ulClass = 'navigation';
/**
- * Sets which partial view script to use for rendering menu
+ * View helper entry point:
+ * Retrieves helper and optionally sets container to operate on
*
- * @param string|array $partial partial view script or null. If an array is
- * given, it is expected to contain two
- * values; the partial view script to use,
- * and the module where the script can be
- * found.
- * @return Menu fluent interface, returns self
+ * @param AbstractContainer $container [optional] container to operate on
+ * @return Menu
*/
- public function setPartial($partial)
+ public function __invoke($container = null)
{
- if (null === $partial || is_string($partial) || is_array($partial)) {
- $this->partial = $partial;
+ if (null !== $container) {
+ $this->setContainer($container);
}
return $this;
}
/**
- * Returns partial view script to use for rendering menu
+ * Renders menu
*
- * @return string|array|null
- */
- public function getPartial()
- {
- return $this->partial;
- }
-
- // Public methods:
-
- /**
- * Returns an HTML string containing an 'a' element for the given page if
- * the page's href is not empty, and a 'span' element if it is empty
+ * Implements {@link HelperInterface::render()}.
*
- * Overrides {@link AbstractHelper::htmlify()}.
+ * If a partial view is registered in the helper, the menu will be rendered
+ * using the given partial script. If no partial is registered, the menu
+ * will be rendered as an 'ul' element by the helper's internal method.
*
- * @param AbstractPage $page page to generate HTML for
- * @param bool $escapeLabel Whether or not to escape the label
- * @return string HTML string for the given page
- */
- public function htmlify(AbstractPage $page, $escapeLabel = true)
- {
- // get label and title for translating
- $label = $page->getLabel();
- $title = $page->getTitle();
-
- // translate label and title?
- if (null !== ($translator = $this->getTranslator())) {
- $textDomain = $this->getTranslatorTextDomain();
- if (is_string($label) && !empty($label)) {
- $label = $translator->translate($label, $textDomain);
- }
- if (is_string($title) && !empty($title)) {
- $title = $translator->translate($title, $textDomain);
- }
- }
-
- // get attribs for element
- $attribs = array(
- 'id' => $page->getId(),
- 'title' => $title,
- 'class' => $page->getClass()
- );
-
- // does page have a href?
- $href = $page->getHref();
- if ($href) {
- $element = 'a';
- $attribs['href'] = $href;
- $attribs['target'] = $page->getTarget();
- } else {
- $element = 'span';
- }
-
- $html = '<' . $element . $this->htmlAttribs($attribs) . '>';
- if ($escapeLabel === true) {
- $escaper = $this->view->plugin('escapeHtml');
- $html .= $escaper($label);
- } else {
- $html .= $label;
- }
- $html .= '</' . $element . '>';
-
- return $html;
- }
-
- /**
- * Normalizes given render options
+ * @see renderPartial()
+ * @see renderMenu()
*
- * @param array $options [optional] options to normalize
- * @return array normalized options
+ * @param AbstractContainer $container [optional] container to render. Default is
+ * to render the container registered in the helper.
+ * @return string
*/
- protected function normalizeOptions(array $options = array())
+ public function render($container = null)
{
- if (isset($options['indent'])) {
- $options['indent'] = $this->getWhitespace($options['indent']);
- } else {
- $options['indent'] = $this->getIndent();
- }
-
- if (isset($options['ulClass']) && $options['ulClass'] !== null) {
- $options['ulClass'] = (string) $options['ulClass'];
- } else {
- $options['ulClass'] = $this->getUlClass();
- }
-
- if (array_key_exists('minDepth', $options)) {
- if (null !== $options['minDepth']) {
- $options['minDepth'] = (int) $options['minDepth'];
- }
- } else {
- $options['minDepth'] = $this->getMinDepth();
- }
-
- if ($options['minDepth'] < 0 || $options['minDepth'] === null) {
- $options['minDepth'] = 0;
- }
-
- if (array_key_exists('maxDepth', $options)) {
- if (null !== $options['maxDepth']) {
- $options['maxDepth'] = (int) $options['maxDepth'];
- }
- } else {
- $options['maxDepth'] = $this->getMaxDepth();
- }
-
- if (!isset($options['onlyActiveBranch'])) {
- $options['onlyActiveBranch'] = $this->getOnlyActiveBranch();
- }
-
- if (!isset($options['escapeLabels'])) {
- $options['escapeLabels'] = $this->escapeLabels;
- }
-
- if (!isset($options['renderParents'])) {
- $options['renderParents'] = $this->getRenderParents();
+ $partial = $this->getPartial();
+ if ($partial) {
+ return $this->renderPartial($container, $partial);
}
- return $options;
+ return $this->renderMenu($container);
}
- // Render methods:
-
/**
* Renders the deepest active menu within [$minDepth, $maxDepth], (called
* from {@link renderMenu()})
*
- * @param AbstractContainer $container container to render
- * @param string $ulClass CSS class for first UL
- * @param string $indent initial indentation
- * @param int|null $minDepth minimum depth
- * @param int|null $maxDepth maximum depth
- * @param bool $escapeLabels Whether or not to escape the labels
- * @return string rendered menu
+ * @param AbstractContainer $container container to render
+ * @param string $ulClass CSS class for first UL
+ * @param string $indent initial indentation
+ * @param int|null $minDepth minimum depth
+ * @param int|null $maxDepth maximum depth
+ * @param bool $escapeLabels Whether or not to escape the labels
+ * @param bool $addClassToListItem Whether or not page class applied to <li> element
+ * @return string
*/
- protected function renderDeepestMenu(AbstractContainer $container,
- $ulClass,
- $indent,
- $minDepth,
- $maxDepth,
- $escapeLabels
+ protected function renderDeepestMenu(
+ AbstractContainer $container,
+ $ulClass,
+ $indent,
+ $minDepth,
+ $maxDepth,
+ $escapeLabels,
+ $addClassToListItem
) {
if (!$active = $this->findActive($container, $minDepth - 1, $maxDepth)) {
return '';
@@ -348,9 +150,21 @@ class Menu extends AbstractHelper
if (!$this->accept($subPage)) {
continue;
}
- $liClass = $subPage->isActive(true) ? ' class="active"' : '';
+
+ // render li tag and page
+ $liClasses = array();
+ // Is page active?
+ if ($subPage->isActive(true)) {
+ $liClasses[] = 'active';
+ }
+ // Add CSS class from page to <li>
+ if ($addClassToListItem && $subPage->getClass()) {
+ $liClasses[] = $subPage->getClass();
+ }
+ $liClass = empty($liClasses) ? '' : ' class="' . implode(' ', $liClasses) . '"';
+
$html .= $indent . ' <li' . $liClass . '>' . self::EOL;
- $html .= $indent . ' ' . $this->htmlify($subPage, $escapeLabels) . self::EOL;
+ $html .= $indent . ' ' . $this->htmlify($subPage, $escapeLabels, $addClassToListItem) . self::EOL;
$html .= $indent . ' </li>' . self::EOL;
}
@@ -360,24 +174,76 @@ class Menu extends AbstractHelper
}
/**
- * Renders a normal menu (called from {@link renderMenu()})
+ * Renders helper
*
- * @param AbstractContainer $container container to render
- * @param string $ulClass CSS class for first UL
- * @param string $indent initial indentation
- * @param int|null $minDepth minimum depth
- * @param int|null $maxDepth maximum depth
- * @param bool $onlyActive render only active branch?
- * @param bool $escapeLabels Whether or not to escape the labels
+ * Renders a HTML 'ul' for the given $container. If $container is not given,
+ * the container registered in the helper will be used.
+ *
+ * Available $options:
+ *
+ *
+ * @param AbstractContainer $container [optional] container to create menu from.
+ * Default is to use the container retrieved
+ * from {@link getContainer()}.
+ * @param array $options [optional] options for controlling rendering
+ * @return string
+ */
+ public function renderMenu($container = null, array $options = array())
+ {
+ $this->parseContainer($container);
+ if (null === $container) {
+ $container = $this->getContainer();
+ }
+
+
+ $options = $this->normalizeOptions($options);
+
+ if ($options['onlyActiveBranch'] && !$options['renderParents']) {
+ $html = $this->renderDeepestMenu($container,
+ $options['ulClass'],
+ $options['indent'],
+ $options['minDepth'],
+ $options['maxDepth'],
+ $options['escapeLabels'],
+ $options['addClassToListItem']
+ );
+ } else {
+ $html = $this->renderNormalMenu($container,
+ $options['ulClass'],
+ $options['indent'],
+ $options['minDepth'],
+ $options['maxDepth'],
+ $options['onlyActiveBranch'],
+ $options['escapeLabels'],
+ $options['addClassToListItem']
+ );
+ }
+
+ return $html;
+ }
+
+ /**
+ * Renders a normal menu (called from {@link renderMenu()})
+ *
+ * @param AbstractContainer $container container to render
+ * @param string $ulClass CSS class for first UL
+ * @param string $indent initial indentation
+ * @param int|null $minDepth minimum depth
+ * @param int|null $maxDepth maximum depth
+ * @param bool $onlyActive render only active branch?
+ * @param bool $escapeLabels Whether or not to escape the labels
+ * @param bool $addClassToListItem Whether or not page class applied to <li> element
* @return string
*/
- protected function renderNormalMenu(AbstractContainer $container,
- $ulClass,
- $indent,
- $minDepth,
- $maxDepth,
- $onlyActive,
- $escapeLabels
+ protected function renderNormalMenu(
+ AbstractContainer $container,
+ $ulClass,
+ $indent,
+ $minDepth,
+ $maxDepth,
+ $onlyActive,
+ $escapeLabels,
+ $addClassToListItem
) {
$html = '';
@@ -392,7 +258,7 @@ class Menu extends AbstractHelper
// create iterator
$iterator = new RecursiveIteratorIterator($container,
- RecursiveIteratorIterator::SELF_FIRST);
+ RecursiveIteratorIterator::SELF_FIRST);
if (is_int($maxDepth)) {
$iterator->setMaxDepth($maxDepth);
}
@@ -455,9 +321,19 @@ class Menu extends AbstractHelper
}
// render li tag and page
- $liClass = $isActive ? ' class="active"' : '';
+ $liClasses = array();
+ // Is page active?
+ if ($isActive) {
+ $liClasses[] = 'active';
+ }
+ // Add CSS class from page to <li>
+ if ($addClassToListItem && $page->getClass()) {
+ $liClasses[] = $page->getClass();
+ }
+ $liClass = empty($liClasses) ? '' : ' class="' . implode(' ', $liClasses) . '"';
+
$html .= $myIndent . ' <li' . $liClass . '>' . self::EOL
- . $myIndent . ' ' . $this->htmlify($page, $escapeLabels) . self::EOL;
+ . $myIndent . ' ' . $this->htmlify($page, $escapeLabels, $addClassToListItem) . self::EOL;
// store as previous depth for next iteration
$prevDepth = $depth;
@@ -468,7 +344,7 @@ class Menu extends AbstractHelper
for ($i = $prevDepth+1; $i > 0; $i--) {
$myIndent = $indent . str_repeat(' ', $i-1);
$html .= $myIndent . ' </li>' . self::EOL
- . $myIndent . '</ul>' . self::EOL;
+ . $myIndent . '</ul>' . self::EOL;
}
$html = rtrim($html, self::EOL);
}
@@ -476,96 +352,6 @@ class Menu extends AbstractHelper
return $html;
}
- /**
- * Renders helper
- *
- * Renders a HTML 'ul' for the given $container. If $container is not given,
- * the container registered in the helper will be used.
- *
- * Available $options:
- *
- *
- * @param AbstractContainer $container [optional] container to create menu from.
- * Default is to use the container retrieved
- * from {@link getContainer()}.
- * @param array $options [optional] options for controlling rendering
- * @return string rendered menu
- */
- public function renderMenu($container = null, array $options = array())
- {
- $this->parseContainer($container);
- if (null === $container) {
- $container = $this->getContainer();
- }
-
-
- $options = $this->normalizeOptions($options);
-
- if ($options['onlyActiveBranch'] && !$options['renderParents']) {
- $html = $this->renderDeepestMenu($container,
- $options['ulClass'],
- $options['indent'],
- $options['minDepth'],
- $options['maxDepth'],
- $options['escapeLabels']);
- } else {
- $html = $this->renderNormalMenu($container,
- $options['ulClass'],
- $options['indent'],
- $options['minDepth'],
- $options['maxDepth'],
- $options['onlyActiveBranch'],
- $options['escapeLabels']);
- }
-
- return $html;
- }
-
- /**
- * Renders the inner-most sub menu for the active page in the $container
- *
- * This is a convenience method which is equivalent to the following call:
- * <code>
- * renderMenu($container, array(
- * 'indent' => $indent,
- * 'ulClass' => $ulClass,
- * 'minDepth' => null,
- * 'maxDepth' => null,
- * 'onlyActiveBranch' => true,
- * 'renderParents' => false
- * ));
- * </code>
- *
- * @param AbstractContainer $container [optional] container to
- * render. Default is to render
- * the container registered in
- * the helper.
- * @param string $ulClass [optional] CSS class to
- * use for UL element. Default
- * is to use the value from
- * {@link getUlClass()}.
- * @param string|int $indent [optional] indentation as
- * a string or number of
- * spaces. Default is to use
- * the value retrieved from
- * {@link getIndent()}.
- * @return string rendered content
- */
- public function renderSubMenu(AbstractContainer $container = null,
- $ulClass = null,
- $indent = null
- ) {
- return $this->renderMenu($container, array(
- 'indent' => $indent,
- 'ulClass' => $ulClass,
- 'minDepth' => null,
- 'maxDepth' => null,
- 'onlyActiveBranch' => true,
- 'renderParents' => false,
- 'escapeLabels' => true
- ));
- }
-
/**
* Renders the given $container by invoking the partial view helper
*
@@ -583,7 +369,7 @@ class Menu extends AbstractHelper
* values; the partial view script to use,
* and the module where the script can be
* found.
- * @return string helper output
+ * @return string
* @throws Exception\RuntimeException if no partial provided
* @throws Exception\InvalidArgumentException if partial is invalid array
*/
@@ -612,8 +398,8 @@ class Menu extends AbstractHelper
if (count($partial) != 2) {
throw new Exception\InvalidArgumentException(
'Unable to render menu: A view partial supplied as '
- . 'an array must contain two values: partial view '
- . 'script and module where script can be found'
+ . 'an array must contain two values: partial view '
+ . 'script and module where script can be found'
);
}
@@ -625,31 +411,311 @@ class Menu extends AbstractHelper
return $partialHelper($partial, $model);
}
- // Zend\View\Helper\Navigation\Helper:
+ /**
+ * Renders the inner-most sub menu for the active page in the $container
+ *
+ * This is a convenience method which is equivalent to the following call:
+ * <code>
+ * renderMenu($container, array(
+ * 'indent' => $indent,
+ * 'ulClass' => $ulClass,
+ * 'minDepth' => null,
+ * 'maxDepth' => null,
+ * 'onlyActiveBranch' => true,
+ * 'renderParents' => false
+ * ));
+ * </code>
+ *
+ * @param AbstractContainer $container [optional] container to
+ * render. Default is to render
+ * the container registered in
+ * the helper.
+ * @param string $ulClass [optional] CSS class to
+ * use for UL element. Default
+ * is to use the value from
+ * {@link getUlClass()}.
+ * @param string|int $indent [optional] indentation as
+ * a string or number of
+ * spaces. Default is to use
+ * the value retrieved from
+ * {@link getIndent()}.
+ * @return string
+ */
+ public function renderSubMenu(
+ AbstractContainer $container = null,
+ $ulClass = null,
+ $indent = null
+ ) {
+ return $this->renderMenu($container, array(
+ 'indent' => $indent,
+ 'ulClass' => $ulClass,
+ 'minDepth' => null,
+ 'maxDepth' => null,
+ 'onlyActiveBranch' => true,
+ 'renderParents' => false,
+ 'escapeLabels' => true,
+ 'addClassToListItem' => false,
+ ));
+ }
/**
- * Renders menu
+ * Returns an HTML string containing an 'a' element for the given page if
+ * the page's href is not empty, and a 'span' element if it is empty
*
- * Implements {@link HelperInterface::render()}.
+ * Overrides {@link AbstractHelper::htmlify()}.
*
- * If a partial view is registered in the helper, the menu will be rendered
- * using the given partial script. If no partial is registered, the menu
- * will be rendered as an 'ul' element by the helper's internal method.
+ * @param AbstractPage $page page to generate HTML for
+ * @param bool $escapeLabel Whether or not to escape the label
+ * @return string
+ */
+ public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToListItem = false)
+ {
+ // get label and title for translating
+ $label = $page->getLabel();
+ $title = $page->getTitle();
+
+ // translate label and title?
+ if (null !== ($translator = $this->getTranslator())) {
+ $textDomain = $this->getTranslatorTextDomain();
+ if (is_string($label) && !empty($label)) {
+ $label = $translator->translate($label, $textDomain);
+ }
+ if (is_string($title) && !empty($title)) {
+ $title = $translator->translate($title, $textDomain);
+ }
+ }
+
+ // get attribs for element
+ $attribs = array(
+ 'id' => $page->getId(),
+ 'title' => $title,
+ );
+
+ if ($addClassToListItem === false) {
+ $attribs['class'] = $page->getClass();
+ }
+
+ // does page have a href?
+ $href = $page->getHref();
+ if ($href) {
+ $element = 'a';
+ $attribs['href'] = $href;
+ $attribs['target'] = $page->getTarget();
+ } else {
+ $element = 'span';
+ }
+
+ $html = '<' . $element . $this->htmlAttribs($attribs) . '>';
+ if ($escapeLabel === true) {
+ $escaper = $this->view->plugin('escapeHtml');
+ $html .= $escaper($label);
+ } else {
+ $html .= $label;
+ }
+ $html .= '</' . $element . '>';
+
+ return $html;
+ }
+
+ /**
+ * Normalizes given render options
*
- * @see renderPartial()
- * @see renderMenu()
+ * @param array $options [optional] options to normalize
+ * @return array
+ */
+ protected function normalizeOptions(array $options = array())
+ {
+ if (isset($options['indent'])) {
+ $options['indent'] = $this->getWhitespace($options['indent']);
+ } else {
+ $options['indent'] = $this->getIndent();
+ }
+
+ if (isset($options['ulClass']) && $options['ulClass'] !== null) {
+ $options['ulClass'] = (string) $options['ulClass'];
+ } else {
+ $options['ulClass'] = $this->getUlClass();
+ }
+
+ if (array_key_exists('minDepth', $options)) {
+ if (null !== $options['minDepth']) {
+ $options['minDepth'] = (int) $options['minDepth'];
+ }
+ } else {
+ $options['minDepth'] = $this->getMinDepth();
+ }
+
+ if ($options['minDepth'] < 0 || $options['minDepth'] === null) {
+ $options['minDepth'] = 0;
+ }
+
+ if (array_key_exists('maxDepth', $options)) {
+ if (null !== $options['maxDepth']) {
+ $options['maxDepth'] = (int) $options['maxDepth'];
+ }
+ } else {
+ $options['maxDepth'] = $this->getMaxDepth();
+ }
+
+ if (!isset($options['onlyActiveBranch'])) {
+ $options['onlyActiveBranch'] = $this->getOnlyActiveBranch();
+ }
+
+ if (!isset($options['escapeLabels'])) {
+ $options['escapeLabels'] = $this->escapeLabels;
+ }
+
+ if (!isset($options['renderParents'])) {
+ $options['renderParents'] = $this->getRenderParents();
+ }
+
+ if (!isset($options['addClassToListItem'])) {
+ $options['addClassToListItem'] = $this->getAddClassToListItem();
+ }
+
+ return $options;
+ }
+
+ /**
+ * Sets a flag indicating whether labels should be escaped
*
- * @param AbstractContainer $container [optional] container to render. Default is
- * to render the container registered in the
- * helper.
- * @return string helper output
+ * @param bool $flag [optional] escape labels
+ * @return Menu
*/
- public function render($container = null)
+ public function escapeLabels($flag = true)
{
- $partial = $this->getPartial();
- if ($partial) {
- return $this->renderPartial($container, $partial);
+ $this->escapeLabels = (bool) $flag;
+ return $this;
+ }
+
+ /**
+ * Enables/disables page class applied to <li> element
+ *
+ * @param bool $flag [optional] page class applied to <li> element
+ * Default is true.
+ * @return Menu fluent interface, returns self
+ */
+ public function setAddClassToListItem($flag = true)
+ {
+ $this->addClassToListItem = (bool) $flag;
+ return $this;
+ }
+
+ /**
+ * Returns flag indicating whether page class should be applied to <li> element
+ *
+ * By default, this value is false.
+ *
+ * @return bool whether parents should be rendered
+ */
+ public function getAddClassToListItem()
+ {
+ return $this->addClassToListItem;
+ }
+
+ /**
+ * Sets a flag indicating whether only active branch should be rendered
+ *
+ * @param bool $flag [optional] render only active branch.
+ * @return Menu
+ */
+ public function setOnlyActiveBranch($flag = true)
+ {
+ $this->onlyActiveBranch = (bool) $flag;
+ return $this;
+ }
+
+ /**
+ * Returns a flag indicating whether only active branch should be rendered
+ *
+ * By default, this value is false, meaning the entire menu will be
+ * be rendered.
+ *
+ * @return bool
+ */
+ public function getOnlyActiveBranch()
+ {
+ return $this->onlyActiveBranch;
+ }
+
+ /**
+ * Sets which partial view script to use for rendering menu
+ *
+ * @param string|array $partial partial view script or null. If an array is
+ * given, it is expected to contain two
+ * values; the partial view script to use,
+ * and the module where the script can be
+ * found.
+ * @return Menu
+ */
+ public function setPartial($partial)
+ {
+ if (null === $partial || is_string($partial) || is_array($partial)) {
+ $this->partial = $partial;
}
- return $this->renderMenu($container);
+
+ return $this;
+ }
+
+ /**
+ * Returns partial view script to use for rendering menu
+ *
+ * @return string|array|null
+ */
+ public function getPartial()
+ {
+ return $this->partial;
+ }
+
+ /**
+ * Enables/disables rendering of parents when only rendering active branch
+ *
+ * See {@link setOnlyActiveBranch()} for more information.
+ *
+ * @param bool $flag [optional] render parents when rendering active branch.
+ * @return Menu
+ */
+ public function setRenderParents($flag = true)
+ {
+ $this->renderParents = (bool) $flag;
+ return $this;
+ }
+
+ /**
+ * Returns flag indicating whether parents should be rendered when rendering
+ * only the active branch
+ *
+ * By default, this value is true.
+ *
+ * @return bool
+ */
+ public function getRenderParents()
+ {
+ return $this->renderParents;
+ }
+
+ /**
+ * Sets CSS class to use for the first 'ul' element when rendering
+ *
+ * @param string $ulClass CSS class to set
+ * @return Menu
+ */
+ public function setUlClass($ulClass)
+ {
+ if (is_string($ulClass)) {
+ $this->ulClass = $ulClass;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Returns CSS class to use for the first 'ul' element when rendering
+ *
+ * @return string
+ */
+ public function getUlClass()
+ {
+ return $this->ulClass;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php
index 32166e3e6e5c99afa7fa5e5edf184aa891d73cf0..f8243de2d8d93d80a0792393bfbd8c6ecc445c3b 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php
@@ -47,11 +47,18 @@ class Sitemap extends AbstractHelper
protected $formatOutput = false;
/**
- * Whether the XML declaration should be included in XML output
+ * Server url
*
- * @var bool
+ * @var string
*/
- protected $useXmlDeclaration = true;
+ protected $serverUrl;
+
+ /**
+ * List of urls in the sitemap
+ *
+ * @var array
+ */
+ protected $urls = array();
/**
* Whether sitemap should be validated using Zend\Validate\Sitemap\*
@@ -68,18 +75,11 @@ class Sitemap extends AbstractHelper
protected $useSchemaValidation = false;
/**
- * Server url
- *
- * @var string
- */
- protected $serverUrl;
-
- /**
- * List of urls in the sitemap
+ * Whether the XML declaration should be included in XML output
*
- * @var array
+ * @var bool
*/
- protected $urls = array();
+ protected $useXmlDeclaration = true;
/**
* Helper entry point
@@ -97,188 +97,22 @@ class Sitemap extends AbstractHelper
}
/**
- * Sets whether XML output should be formatted
- *
- * @param bool $formatOutput [optional] whether output should be formatted. Default is true.
- * @return Sitemap fluent interface, returns self
- */
- public function setFormatOutput($formatOutput = true)
- {
- $this->formatOutput = (bool) $formatOutput;
- return $this;
- }
-
- /**
- * Returns whether XML output should be formatted
- *
- * @return bool whether XML output should be formatted
- */
- public function getFormatOutput()
- {
- return $this->formatOutput;
- }
-
- /**
- * Sets whether the XML declaration should be used in output
- *
- * @param bool $useXmlDecl whether XML declaration should be rendered
- * @return Sitemap fluent interface, returns self
- */
- public function setUseXmlDeclaration($useXmlDecl)
- {
- $this->useXmlDeclaration = (bool) $useXmlDecl;
- return $this;
- }
-
- /**
- * Returns whether the XML declaration should be used in output
- *
- * @return bool whether the XML declaration should be used in output
- */
- public function getUseXmlDeclaration()
- {
- return $this->useXmlDeclaration;
- }
-
- /**
- * Sets whether sitemap should be validated using Zend\Validate\Sitemap_*
- *
- * @param bool $useSitemapValidators whether sitemap validators should be used
- * @return Sitemap fluent interface, returns self
- */
- public function setUseSitemapValidators($useSitemapValidators)
- {
- $this->useSitemapValidators = (bool) $useSitemapValidators;
- return $this;
- }
-
- /**
- * Returns whether sitemap should be validated using Zend\Validate\Sitemap_*
- *
- * @return bool whether sitemap should be validated using validators
- */
- public function getUseSitemapValidators()
- {
- return $this->useSitemapValidators;
- }
-
- /**
- * Sets whether sitemap should be schema validated when generated
- *
- * @param bool $schemaValidation whether sitemap should validated using XSD Schema
- * @return Sitemap
- */
- public function setUseSchemaValidation($schemaValidation)
- {
- $this->useSchemaValidation = (bool) $schemaValidation;
- return $this;
- }
-
- /**
- * Returns true if sitemap should be schema validated when generated
- *
- * @return bool
- */
- public function getUseSchemaValidation()
- {
- return $this->useSchemaValidation;
- }
-
- /**
- * Sets server url (scheme and host-related stuff without request URI)
- *
- * E.g. http://www.example.com
- *
- * @param string $serverUrl server URL to set (only scheme and host)
- * @return Sitemap fluent interface, returns self
- * @throws Exception\InvalidArgumentException if invalid server URL
- */
- public function setServerUrl($serverUrl)
- {
- $uri = Uri\UriFactory::factory($serverUrl);
- $uri->setFragment('');
- $uri->setPath('');
- $uri->setQuery('');
-
- if ($uri->isValid()) {
- $this->serverUrl = $uri->toString();
- } else {
- throw new Exception\InvalidArgumentException(sprintf(
- 'Invalid server URL: "%s"',
- $serverUrl
- ));
- }
-
- return $this;
- }
-
- /**
- * Returns server URL
- *
- * @return string server URL
- */
- public function getServerUrl()
- {
- if (!isset($this->serverUrl)) {
- $serverUrlHelper = $this->getView()->plugin('serverUrl');
- $this->serverUrl = $serverUrlHelper();
- }
-
- return $this->serverUrl;
- }
-
- // Helper methods:
-
- /**
- * Escapes string for XML usage
+ * Renders helper
*
- * @param string $string string to escape
- * @return string escaped string
- */
- protected function xmlEscape($string)
- {
- $escaper = $this->view->plugin('escapeHtml');
- return $escaper($string);
- }
-
- // Public methods:
-
- /**
- * Returns an escaped absolute URL for the given page
+ * Implements {@link HelperInterface::render()}.
*
- * @param AbstractPage $page page to get URL from
+ * @param AbstractContainer $container [optional] container to render. Default is
+ * to render the container registered in the helper.
* @return string
*/
- public function url(AbstractPage $page)
+ public function render($container = null)
{
- $href = $page->getHref();
-
- if (!isset($href{0})) {
- // no href
- return '';
- } elseif ($href{0} == '/') {
- // href is relative to root; use serverUrl helper
- $url = $this->getServerUrl() . $href;
- } elseif (preg_match('/^[a-z]+:/im', (string) $href)) {
- // scheme is given in href; assume absolute URL already
- $url = (string) $href;
- } else {
- // href is relative to current document; use url helpers
- $basePathHelper = $this->getView()->plugin('basepath');
- $curDoc = $basePathHelper();
- $curDoc = ('/' == $curDoc) ? '' : trim($curDoc, '/');
- $url = rtrim($this->getServerUrl(), '/') . '/'
- . $curDoc
- . (empty($curDoc) ? '' : '/') . $href;
- }
-
- if (! in_array($url, $this->urls)) {
-
- $this->urls[] = $url;
- return $this->xmlEscape($url);
- }
+ $dom = $this->getDomSitemap($container);
+ $xml = $this->getUseXmlDeclaration() ?
+ $dom->saveXML() :
+ $dom->saveXML($dom->documentElement);
- return null;
+ return rtrim($xml, PHP_EOL);
}
/**
@@ -365,7 +199,7 @@ class Sitemap extends AbstractHelper
// put url in 'loc' element
$urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS,
- 'loc', $url));
+ 'loc', $url));
// add 'lastmod' element if a valid lastmod is set in page
if (isset($page->lastmod)) {
@@ -426,25 +260,184 @@ class Sitemap extends AbstractHelper
return $dom;
}
- // Zend_View_Helper_Navigation_Helper:
+ /**
+ * Returns an escaped absolute URL for the given page
+ *
+ * @param AbstractPage $page
+ * @return string
+ */
+ public function url(AbstractPage $page)
+ {
+ $href = $page->getHref();
+
+ if (!isset($href{0})) {
+ // no href
+ return '';
+ } elseif ($href{0} == '/') {
+ // href is relative to root; use serverUrl helper
+ $url = $this->getServerUrl() . $href;
+ } elseif (preg_match('/^[a-z]+:/im', (string) $href)) {
+ // scheme is given in href; assume absolute URL already
+ $url = (string) $href;
+ } else {
+ // href is relative to current document; use url helpers
+ $basePathHelper = $this->getView()->plugin('basepath');
+ $curDoc = $basePathHelper();
+ $curDoc = ('/' == $curDoc) ? '' : trim($curDoc, '/');
+ $url = rtrim($this->getServerUrl(), '/') . '/'
+ . $curDoc
+ . (empty($curDoc) ? '' : '/') . $href;
+ }
+
+ if (! in_array($url, $this->urls)) {
+
+ $this->urls[] = $url;
+ return $this->xmlEscape($url);
+ }
+
+ return null;
+ }
/**
- * Renders helper
+ * Escapes string for XML usage
*
- * Implements {@link HelperInterface::render()}.
+ * @param string $string
+ * @return string
+ */
+ protected function xmlEscape($string)
+ {
+ $escaper = $this->view->plugin('escapeHtml');
+ return $escaper($string);
+ }
+
+ /**
+ * Sets whether XML output should be formatted
*
- * @param AbstractContainer $container [optional] container to render. Default is
- * to render the container registered in the
- * helper.
- * @return string helper output
+ * @param bool $formatOutput
+ * @return Sitemap
*/
- public function render($container = null)
+ public function setFormatOutput($formatOutput = true)
{
- $dom = $this->getDomSitemap($container);
- $xml = $this->getUseXmlDeclaration() ?
- $dom->saveXML() :
- $dom->saveXML($dom->documentElement);
+ $this->formatOutput = (bool) $formatOutput;
+ return $this;
+ }
- return rtrim($xml, PHP_EOL);
+ /**
+ * Returns whether XML output should be formatted
+ *
+ * @return bool
+ */
+ public function getFormatOutput()
+ {
+ return $this->formatOutput;
+ }
+
+ /**
+ * Sets server url (scheme and host-related stuff without request URI)
+ *
+ * E.g. http://www.example.com
+ *
+ * @param string $serverUrl
+ * @return Sitemap
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setServerUrl($serverUrl)
+ {
+ $uri = Uri\UriFactory::factory($serverUrl);
+ $uri->setFragment('');
+ $uri->setPath('');
+ $uri->setQuery('');
+
+ if ($uri->isValid()) {
+ $this->serverUrl = $uri->toString();
+ } else {
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Invalid server URL: "%s"',
+ $serverUrl
+ ));
+ }
+
+ return $this;
+ }
+
+ /**
+ * Returns server URL
+ *
+ * @return string
+ */
+ public function getServerUrl()
+ {
+ if (!isset($this->serverUrl)) {
+ $serverUrlHelper = $this->getView()->plugin('serverUrl');
+ $this->serverUrl = $serverUrlHelper();
+ }
+
+ return $this->serverUrl;
+ }
+
+ /**
+ * Sets whether sitemap should be validated using Zend\Validate\Sitemap_*
+ *
+ * @param bool $useSitemapValidators
+ * @return Sitemap
+ */
+ public function setUseSitemapValidators($useSitemapValidators)
+ {
+ $this->useSitemapValidators = (bool) $useSitemapValidators;
+ return $this;
+ }
+
+ /**
+ * Returns whether sitemap should be validated using Zend\Validate\Sitemap_*
+ *
+ * @return bool
+ */
+ public function getUseSitemapValidators()
+ {
+ return $this->useSitemapValidators;
+ }
+
+ /**
+ * Sets whether sitemap should be schema validated when generated
+ *
+ * @param bool $schemaValidation
+ * @return Sitemap
+ */
+ public function setUseSchemaValidation($schemaValidation)
+ {
+ $this->useSchemaValidation = (bool) $schemaValidation;
+ return $this;
+ }
+
+ /**
+ * Returns true if sitemap should be schema validated when generated
+ *
+ * @return bool
+ */
+ public function getUseSchemaValidation()
+ {
+ return $this->useSchemaValidation;
+ }
+
+ /**
+ * Sets whether the XML declaration should be used in output
+ *
+ * @param bool $useXmlDecl
+ * @return Sitemap
+ */
+ public function setUseXmlDeclaration($useXmlDecl)
+ {
+ $this->useXmlDeclaration = (bool) $useXmlDecl;
+ return $this;
+ }
+
+ /**
+ * Returns whether the XML declaration should be used in output
+ *
+ * @return bool
+ */
+ public function getUseXmlDeclaration()
+ {
+ return $this->useXmlDeclaration;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php
index b4948a101759cf5d2de6923cde616740408c17dc..b35cd6826a1535a3dad0c9ef4975dcc560a97d2c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php
@@ -15,13 +15,6 @@ use Zend\View\Exception;
class PaginationControl extends AbstractHelper
{
- /**
- * Default view partial
- *
- * @var string|array
- */
- protected static $defaultViewPartial = null;
-
/**
* Default Scrolling Style
*
@@ -30,57 +23,24 @@ class PaginationControl extends AbstractHelper
protected static $defaultScrollingStyle = 'sliding';
/**
- * Sets the default view partial.
- *
- * @param string|array $partial View partial
- */
- public static function setDefaultViewPartial($partial)
- {
- static::$defaultViewPartial = $partial;
- }
-
- /**
- * Gets the default view partial
- *
- * @return string|array
- */
- public static function getDefaultViewPartial()
- {
- return static::$defaultViewPartial;
- }
-
- /**
- * Gets the default scrolling style
- *
- * @return string
- */
- public static function getDefaultScrollingStyle()
- {
- return static::$defaultScrollingStyle;
- }
-
- /**
- * Sets the default Scrolling Style
+ * Default view partial
*
- * @param string $style string 'all' | 'elastic' | 'sliding' | 'jumping'
+ * @var string|array
*/
- public static function setDefaultScrollingStyle($style)
- {
- static::$defaultScrollingStyle = $style;
- }
+ protected static $defaultViewPartial = null;
/**
* Render the provided pages. This checks if $view->paginator is set and,
* if so, uses that. Also, if no scrolling style or partial are specified,
* the defaults will be used (if set).
*
- * @param \Zend\Paginator\Paginator (Optional) $paginator
- * @param string $scrollingStyle (Optional) Scrolling style
- * @param string $partial (Optional) View partial
- * @param array|string $params (Optional) params to pass to the partial
- * @return string
+ * @param Paginator\Paginator $paginator (Optional)
+ * @param string $scrollingStyle (Optional) Scrolling style
+ * @param string $partial (Optional) View partial
+ * @param array|string $params (Optional) params to pass to the partial
* @throws Exception\RuntimeException if no paginator or no view partial provided
* @throws Exception\InvalidArgumentException if partial is invalid array
+ * @return string
*/
public function __invoke(Paginator\Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null)
{
@@ -128,4 +88,44 @@ class PaginationControl extends AbstractHelper
$partialHelper = $this->view->plugin('partial');
return $partialHelper($partial, $pages);
}
+
+ /**
+ * Sets the default Scrolling Style
+ *
+ * @param string $style string 'all' | 'elastic' | 'sliding' | 'jumping'
+ */
+ public static function setDefaultScrollingStyle($style)
+ {
+ static::$defaultScrollingStyle = $style;
+ }
+
+ /**
+ * Gets the default scrolling style
+ *
+ * @return string
+ */
+ public static function getDefaultScrollingStyle()
+ {
+ return static::$defaultScrollingStyle;
+ }
+
+ /**
+ * Sets the default view partial.
+ *
+ * @param string|array $partial View partial
+ */
+ public static function setDefaultViewPartial($partial)
+ {
+ static::$defaultViewPartial = $partial;
+ }
+
+ /**
+ * Gets the default view partial
+ *
+ * @return string|array
+ */
+ public static function getDefaultViewPartial()
+ {
+ return static::$defaultViewPartial;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php
index cb2d933a25ce5bd19de418f813b53164a9156f17..da745ed1884d54474d1eee38902a3eaee1173e4e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php
@@ -19,6 +19,7 @@ class Partial extends AbstractHelper
{
/**
* Variable to which object will be assigned
+ *
* @var string
*/
protected $objectKey;
@@ -27,10 +28,10 @@ class Partial extends AbstractHelper
* Renders a template fragment within a variable scope distinct from the
* calling View object. It proxies to view's render function
*
- * @param string|ModelInterface $name Name of view script, or a view model
- * @param array|object $values Variables to populate in the view
- * @return string|Partial
+ * @param string|ModelInterface $name Name of view script, or a view model
+ * @param array|object $values Variables to populate in the view
* @throws Exception\RuntimeException
+ * @return string|Partial
*/
public function __invoke($name = null, $values = null)
{
@@ -74,6 +75,7 @@ class Partial extends AbstractHelper
}
$this->objectKey = (string) $key;
+
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
index 51da72b590bd0b88d94eb3d81b3b419cf786c034..7b9f9f8201a06a14a9b04897d29338fd81c9ee7a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
@@ -23,7 +23,7 @@ class PartialLoop extends Partial
/**
* Marker to where the pointer is at in the loop
*
- * @var integer
+ * @var int
*/
protected $partialCounter = 0;
@@ -33,10 +33,10 @@ class PartialLoop extends Partial
*
* If no arguments are provided, returns object instance.
*
- * @param string $name Name of view script
- * @param array $values Variables to populate in the view
- * @return string
+ * @param string $name Name of view script
+ * @param array $values Variables to populate in the view
* @throws Exception\InvalidArgumentException
+ * @return string
*/
public function __invoke($name = null, $values = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php
index 32f62f8f62c4dca22eea7d0d7d4223c279ea2659..b4dae0540900d0c37071207171bb995b8d668bf0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php
@@ -10,6 +10,7 @@
namespace Zend\View\Helper;
use Zend\View\Exception\InvalidArgumentException;
+use Zend\View\Helper\Placeholder\Container;
/**
* Helper for passing data between otherwise segregated Views. It's called
@@ -21,32 +22,23 @@ class Placeholder extends AbstractHelper
{
/**
* Placeholder items
+ *
* @var array
*/
protected $items = array();
/**
- * @var \Zend\View\Helper\Placeholder\Registry
- */
- protected $registry;
-
- /**
- * Constructor
- *
- * Retrieve container registry from Placeholder\Registry, or create new one and register it.
- *
+ * Default container class
+ * @var string
*/
- public function __construct()
- {
- $this->registry = Placeholder\Registry::getRegistry();
- }
+ protected $containerClass = 'Zend\View\Helper\Placeholder\Container';
/**
* Placeholder helper
*
* @param string $name
- * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
* @throws InvalidArgumentException
+ * @return Placeholder\Container\AbstractContainer
*/
public function __invoke($name = null)
{
@@ -55,16 +47,52 @@ class Placeholder extends AbstractHelper
}
$name = (string) $name;
- return $this->registry->getContainer($name);
+ return $this->getContainer($name);
+ }
+
+ /**
+ * createContainer
+ *
+ * @param string $key
+ * @param array $value
+ * @return Container\AbstractContainer
+ */
+ public function createContainer($key, array $value = array())
+ {
+ $key = (string) $key;
+
+ $this->items[$key] = new $this->containerClass($value);
+ return $this->items[$key];
+ }
+
+ /**
+ * Retrieve a placeholder container
+ *
+ * @param string $key
+ * @return Container\AbstractContainer
+ */
+ public function getContainer($key)
+ {
+ $key = (string) $key;
+ if (isset($this->items[$key])) {
+ return $this->items[$key];
+ }
+
+ $container = $this->createContainer($key);
+
+ return $container;
}
/**
- * Retrieve the registry
+ * Does a particular container exist?
*
- * @return \Zend\View\Helper\Placeholder\Registry
+ * @param string $key
+ * @return bool
*/
- public function getRegistry()
+ public function containerExists($key)
{
- return $this->registry;
+ $key = (string) $key;
+ $return = array_key_exists($key, $this->items);
+ return $return;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
index caa3668edc9d389a469b0cbbb89cdc320b872a18..6ff12bf3e65ac5cdbf18cc1c564427c894e9b168 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
@@ -18,231 +18,121 @@ abstract class AbstractContainer extends \ArrayObject
{
/**
* Whether or not to override all contents of placeholder
+ *
* @const string
*/
- const SET = 'SET';
+ const SET = 'SET';
/**
* Whether or not to append contents to placeholder
+ *
* @const string
*/
const APPEND = 'APPEND';
/**
* Whether or not to prepend contents to placeholder
+ *
* @const string
*/
const PREPEND = 'PREPEND';
/**
- * What text to prefix the placeholder with when rendering
- * @var string
- */
- protected $prefix = '';
-
- /**
- * What text to append the placeholder with when rendering
- * @var string
- */
- protected $postfix = '';
-
- /**
- * What string to use between individual items in the placeholder when rendering
- * @var string
- */
- protected $separator = '';
-
- /**
- * What string to use as the indentation of output, this will typically be spaces. Eg: ' '
+ * Key to which to capture content
+ *
* @var string
*/
- protected $indent = '';
+ protected $captureKey;
/**
* Whether or not we're already capturing for this given container
+ *
* @var bool
*/
protected $captureLock = false;
/**
* What type of capture (overwrite (set), append, prepend) to use
+ *
* @var string
*/
protected $captureType;
/**
- * Key to which to capture content
- * @var string
- */
- protected $captureKey;
-
- /**
- * Constructor - This is needed so that we can attach a class member as the ArrayObject container
- *
- */
- public function __construct()
- {
- parent::__construct(array(), parent::ARRAY_AS_PROPS);
- }
-
- /**
- * Set a single value
- *
- * @param mixed $value
- * @return void
- */
- public function set($value)
- {
- $this->exchangeArray(array($value));
- return $this;
- }
-
- /**
- * Prepend a value to the top of the container
- *
- * @param mixed $value
- * @return void
- */
- public function prepend($value)
- {
- $values = $this->getArrayCopy();
- array_unshift($values, $value);
- $this->exchangeArray($values);
- return $this;
- }
-
- /**
- * Retrieve container value
- *
- * If single element registered, returns that element; otherwise,
- * serializes to array.
- *
- * @return mixed
- */
- public function getValue()
- {
- if (1 == count($this)) {
- $keys = $this->getKeys();
- $key = array_shift($keys);
- return $this[$key];
- }
-
- return $this->getArrayCopy();
- }
-
- /**
- * Set prefix for __toString() serialization
+ * What string to use as the indentation of output, this will typically be spaces. Eg: ' '
*
- * @param string $prefix
- * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
+ * @var string
*/
- public function setPrefix($prefix)
- {
- $this->prefix = (string) $prefix;
- return $this;
- }
+ protected $indent = '';
/**
- * Retrieve prefix
+ * What text to append the placeholder with when rendering
*
- * @return string
+ * @var string
*/
- public function getPrefix()
- {
- return $this->prefix;
- }
+ protected $postfix = '';
/**
- * Set postfix for __toString() serialization
+ * What text to prefix the placeholder with when rendering
*
- * @param string $postfix
- * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
+ * @var string
*/
- public function setPostfix($postfix)
- {
- $this->postfix = (string) $postfix;
- return $this;
- }
+ protected $prefix = '';
/**
- * Retrieve postfix
+ * What string to use between individual items in the placeholder when rendering
*
- * @return string
+ * @var string
*/
- public function getPostfix()
- {
- return $this->postfix;
- }
+ protected $separator = '';
/**
- * Set separator for __toString() serialization
- *
- * Used to implode elements in container
- *
- * @param string $separator
- * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
+ * Constructor - This is needed so that we can attach a class member as the ArrayObject container
*/
- public function setSeparator($separator)
+ public function __construct()
{
- $this->separator = (string) $separator;
- return $this;
+ parent::__construct(array(), parent::ARRAY_AS_PROPS);
}
/**
- * Retrieve separator
+ * Serialize object to string
*
* @return string
*/
- public function getSeparator()
- {
- return $this->separator;
- }
-
- /**
- * Set the indentation string for __toString() serialization,
- * optionally, if a number is passed, it will be the number of spaces
- *
- * @param string|int $indent
- * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
- */
- public function setIndent($indent)
+ public function __toString()
{
- $this->indent = $this->getWhitespace($indent);
- return $this;
+ return $this->toString();
}
/**
- * Retrieve indentation
+ * Render the placeholder
*
+ * @param null|int|string $indent
* @return string
*/
- public function getIndent()
+ public function toString($indent = null)
{
- return $this->indent;
- }
+ $indent = ($indent !== null)
+ ? $this->getWhitespace($indent)
+ : $this->getIndent();
- /**
- * Retrieve whitespace representation of $indent
- *
- * @param int|string $indent
- * @return string
- */
- public function getWhitespace($indent)
- {
- if (is_int($indent)) {
- $indent = str_repeat(' ', $indent);
- }
+ $items = $this->getArrayCopy();
+ $return = $indent
+ . $this->getPrefix()
+ . implode($this->getSeparator(), $items)
+ . $this->getPostfix();
+ $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
- return (string) $indent;
+ return $return;
}
/**
* Start capturing content to push into placeholder
*
* @param string $type How to capture content into placeholder; append, prepend, or set
- * @param mixed $key Key to which to capture content
- * @return void
+ * @param mixed $key Key to which to capture content
* @throws Exception\RuntimeException if nested captures detected
+ * @return void
*/
public function captureStart($type = AbstractContainer::APPEND, $key = null)
{
@@ -314,13 +204,75 @@ abstract class AbstractContainer extends \ArrayObject
public function getKeys()
{
$array = $this->getArrayCopy();
+
return array_keys($array);
}
/**
- * Next Index
+ * Retrieve container value
+ *
+ * If single element registered, returns that element; otherwise,
+ * serializes to array.
+ *
+ * @return mixed
+ */
+ public function getValue()
+ {
+ if (1 == count($this)) {
+ $keys = $this->getKeys();
+ $key = array_shift($keys);
+ return $this[$key];
+ }
+
+ return $this->getArrayCopy();
+ }
+
+ /**
+ * Retrieve whitespace representation of $indent
+ *
+ * @param int|string $indent
+ * @return string
+ */
+ public function getWhitespace($indent)
+ {
+ if (is_int($indent)) {
+ $indent = str_repeat(' ', $indent);
+ }
+
+ return (string) $indent;
+ }
+
+ /**
+ * Set a single value
+ *
+ * @param mixed $value
+ * @return void
+ */
+ public function set($value)
+ {
+ $this->exchangeArray(array($value));
+
+ return $this;
+ }
+
+ /**
+ * Prepend a value to the top of the container
+ *
+ * @param mixed $value
+ * @return void
+ */
+ public function prepend($value)
+ {
+ $values = $this->getArrayCopy();
+ array_unshift($values, $value);
+ $this->exchangeArray($values);
+
+ return $this;
+ }
+
+ /**
+ * Next Index as defined by the PHP manual
*
- * as defined by the PHP manual
* @return int
*/
public function nextIndex()
@@ -334,33 +286,93 @@ abstract class AbstractContainer extends \ArrayObject
}
/**
- * Render the placeholder
+ * Set the indentation string for __toString() serialization,
+ * optionally, if a number is passed, it will be the number of spaces
+ *
+ * @param string|int $indent
+ * @return AbstractContainer
+ */
+ public function setIndent($indent)
+ {
+ $this->indent = $this->getWhitespace($indent);
+ return $this;
+ }
+
+ /**
+ * Retrieve indentation
*
- * @param null|int|string $indent
* @return string
*/
- public function toString($indent = null)
+ public function getIndent()
{
- $indent = ($indent !== null)
- ? $this->getWhitespace($indent)
- : $this->getIndent();
+ return $this->indent;
+ }
- $items = $this->getArrayCopy();
- $return = $indent
- . $this->getPrefix()
- . implode($this->getSeparator(), $items)
- . $this->getPostfix();
- $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
- return $return;
+ /**
+ * Set postfix for __toString() serialization
+ *
+ * @param string $postfix
+ * @return AbstractContainer
+ */
+ public function setPostfix($postfix)
+ {
+ $this->postfix = (string) $postfix;
+ return $this;
}
/**
- * Serialize object to string
+ * Retrieve postfix
*
* @return string
*/
- public function __toString()
+ public function getPostfix()
{
- return $this->toString();
+ return $this->postfix;
+ }
+
+ /**
+ * Set prefix for __toString() serialization
+ *
+ * @param string $prefix
+ * @return AbstractContainer
+ */
+ public function setPrefix($prefix)
+ {
+ $this->prefix = (string) $prefix;
+ return $this;
+ }
+
+ /**
+ * Retrieve prefix
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->prefix;
+ }
+
+ /**
+ * Set separator for __toString() serialization
+ *
+ * Used to implode elements in container
+ *
+ * @param string $separator
+ * @return AbstractContainer
+ */
+ public function setSeparator($separator)
+ {
+ $this->separator = (string) $separator;
+ return $this;
+ }
+
+ /**
+ * Retrieve separator
+ *
+ * @return string
+ */
+ public function getSeparator()
+ {
+ return $this->separator;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
index 4ea7446b7ba3edf14826f8d38a8c938cac17cfeb..5ab9ed6731871a3164fdb6530ad96b9e9052cdfd 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
@@ -9,45 +9,45 @@
namespace Zend\View\Helper\Placeholder\Container;
+use ArrayAccess;
+use Countable;
+use IteratorAggregate;
use Zend\Escaper\Escaper;
use Zend\View\Exception;
-use Zend\View\Helper\Placeholder\Registry;
+use Zend\View\Helper\AbstractHelper;
use Zend\View\Renderer\RendererInterface;
/**
* Base class for targeted placeholder helpers
*/
-abstract class AbstractStandalone
- extends \Zend\View\Helper\AbstractHelper
- implements \IteratorAggregate, \Countable, \ArrayAccess
+abstract class AbstractStandalone extends AbstractHelper implements
+ IteratorAggregate,
+ Countable,
+ ArrayAccess
{
/**
- * @var \Zend\View\Helper\Placeholder\Container\AbstractContainer
- */
- protected $container;
-
- /**
- * @var Escaper[]
+ * Flag whether to automatically escape output, must also be
+ * enforced in the child class if __toString/toString is overridden
+ *
+ * @var bool
*/
- protected $escapers = array();
+ protected $autoEscape = true;
/**
- * @var \Zend\View\Helper\Placeholder\Registry
+ * @var AbstractContainer
*/
- protected $registry;
+ protected $container;
/**
- * Registry key under which container registers itself
+ * Default container class
* @var string
*/
- protected $regKey;
+ protected $containerClass = 'Zend\View\Helper\Placeholder\Container';
/**
- * Flag whether to automatically escape output, must also be
- * enforced in the child class if __toString/toString is overridden
- * @var bool
+ * @var Escaper[]
*/
- protected $autoEscape = true;
+ protected $escapers = array();
/**
* Constructor
@@ -55,82 +55,107 @@ abstract class AbstractStandalone
*/
public function __construct()
{
- $this->setRegistry(Registry::getRegistry());
- $this->setContainer($this->getRegistry()->getContainer($this->regKey));
+ $this->setContainer($this->getContainer());
}
/**
- * Retrieve registry
+ * Overload
+ *
+ * Proxy to container methods
*
- * @return \Zend\View\Helper\Placeholder\Registry
+ * @param string $method
+ * @param array $args
+ * @throws Exception\BadMethodCallException
+ * @return mixed
*/
- public function getRegistry()
+ public function __call($method, $args)
{
- return $this->registry;
+ $container = $this->getContainer();
+ if (method_exists($container, $method)) {
+ $return = call_user_func_array(array($container, $method), $args);
+ if ($return === $container) {
+ // If the container is returned, we really want the current object
+ return $this;
+ }
+ return $return;
+ }
+
+ throw new Exception\BadMethodCallException('Method "' . $method . '" does not exist');
}
/**
- * Set registry object
+ * Overloading: set property value
*
- * @param \Zend\View\Helper\Placeholder\Registry $registry
- * @return \Zend\View\Helper\Placeholder\Container\AbstractStandalone
+ * @param string $key
+ * @param mixed $value
+ * @return void
*/
- public function setRegistry(Registry $registry)
+ public function __set($key, $value)
{
- $this->registry = $registry;
- return $this;
+ $container = $this->getContainer();
+ $container[$key] = $value;
}
/**
- * Set Escaper instance
+ * Overloading: retrieve property
*
- * @param Escaper $escaper
- * @return AbstractStandalone
+ * @param string $key
+ * @return mixed
*/
- public function setEscaper(Escaper $escaper)
+ public function __get($key)
{
- $encoding = $escaper->getEncoding();
- $this->escapers[$encoding] = $escaper;
- return $this;
+ $container = $this->getContainer();
+ if (isset($container[$key])) {
+ return $container[$key];
+ }
+
+ return null;
}
/**
- * Get Escaper instance
+ * Overloading: check if property is set
*
- * Lazy-loads one if none available
+ * @param string $key
+ * @return bool
+ */
+ public function __isset($key)
+ {
+ $container = $this->getContainer();
+ return isset($container[$key]);
+ }
+
+ /**
+ * Overloading: unset property
*
- * @param string|null $enc Encoding to use
- * @return mixed
+ * @param string $key
+ * @return void
*/
- public function getEscaper($enc = 'UTF-8')
+ public function __unset($key)
{
- $enc = strtolower($enc);
- if (!isset($this->escapers[$enc])) {
- $this->setEscaper(new Escaper($enc));
+ $container = $this->getContainer();
+ if (isset($container[$key])) {
+ unset($container[$key]);
}
- return $this->escapers[$enc];
}
/**
- * Set whether or not auto escaping should be used
+ * Cast to string representation
*
- * @param bool $autoEscape whether or not to auto escape output
- * @return \Zend\View\Helper\Placeholder\Container\AbstractStandalone
+ * @return string
*/
- public function setAutoEscape($autoEscape = true)
+ public function __toString()
{
- $this->autoEscape = ($autoEscape) ? true : false;
- return $this;
+ return $this->toString();
}
/**
- * Return whether autoEscaping is enabled or disabled
+ * String representation
*
- * return bool
+ * @return string
*/
- public function getAutoEscape()
+ public function toString()
{
- return $this->autoEscape;
+ return $this->getContainer()->toString();
}
/**
@@ -141,138 +166,145 @@ abstract class AbstractStandalone
*/
protected function escape($string)
{
- if ($this->view instanceof RendererInterface
- && method_exists($this->view, 'getEncoding')
+ if ($this->getView() instanceof RendererInterface
+ && method_exists($this->getView(), 'getEncoding')
) {
- $enc = $this->view->getEncoding();
- $escaper = $this->view->plugin('escapeHtml');
+ $enc = $this->getView()->getEncoding();
+ $escaper = $this->getView()->plugin('escapeHtml');
return $escaper((string) $string);
}
- $escaper = $this->getEscaper();
- return $escaper->escapeHtml((string) $string);
+ return $this->getEscaper()->escapeHtml((string) $string);
}
/**
- * Set container on which to operate
+ * Set whether or not auto escaping should be used
*
- * @param \Zend\View\Helper\Placeholder\Container\AbstractContainer $container
- * @return \Zend\View\Helper\Placeholder\Container\AbstractStandalone
+ * @param bool $autoEscape whether or not to auto escape output
+ * @return AbstractStandalone
*/
- public function setContainer(AbstractContainer $container)
+ public function setAutoEscape($autoEscape = true)
{
- $this->container = $container;
+ $this->autoEscape = ($autoEscape) ? true : false;
return $this;
}
/**
- * Retrieve placeholder container
+ * Return whether autoEscaping is enabled or disabled
*
- * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
+ * return bool
*/
- public function getContainer()
+ public function getAutoEscape()
{
- return $this->container;
+ return $this->autoEscape;
}
/**
- * Overloading: set property value
+ * Set container on which to operate
*
- * @param string $key
- * @param mixed $value
- * @return void
+ * @param AbstractContainer $container
+ * @return AbstractStandalone
*/
- public function __set($key, $value)
+ public function setContainer(AbstractContainer $container)
{
- $container = $this->getContainer();
- $container[$key] = $value;
+ $this->container = $container;
+ return $this;
}
/**
- * Overloading: retrieve property
+ * Retrieve placeholder container
*
- * @param string $key
- * @return mixed
+ * @return AbstractContainer
*/
- public function __get($key)
+ public function getContainer()
{
- $container = $this->getContainer();
- if (isset($container[$key])) {
- return $container[$key];
+ if (!$this->container instanceof AbstractContainer) {
+ $this->container = new $this->containerClass();
}
-
- return null;
+ return $this->container;
}
/**
- * Overloading: check if property is set
+ * Delete a container
*
- * @param string $key
* @return bool
*/
- public function __isset($key)
+ public function deleteContainer()
{
- $container = $this->getContainer();
- return isset($container[$key]);
+ if (null != $this->container) {
+ $this->container = null;
+ return true;
+ }
+
+ return false;
}
/**
- * Overloading: unset property
+ * Set the container class to use
*
- * @param string $key
- * @return void
+ * @param string $name
+ * @throws Exception\InvalidArgumentException
+ * @throws Exception\DomainException
+ * @return \Zend\View\Helper\Placeholder\Container\AbstractStandalone
*/
- public function __unset($key)
+ public function setContainerClass($name)
{
- $container = $this->getContainer();
- if (isset($container[$key])) {
- unset($container[$key]);
+ if (!class_exists($name)) {
+ throw new Exception\DomainException(
+ sprintf('%s expects a valid container class name; received "%s", which did not resolve',
+ __METHOD__,
+ $name
+ ));
+ }
+
+ if (!in_array('Zend\View\Helper\Placeholder\Container\AbstractContainer', class_parents($name))) {
+ throw new Exception\InvalidArgumentException('Invalid Container class specified');
}
+
+ $this->containerClass = $name;
+ return $this;
}
/**
- * Overload
- *
- * Proxy to container methods
+ * Retrieve the container class
*
- * @param string $method
- * @param array $args
- * @return mixed
- * @throws Exception\BadMethodCallException
+ * @return string
*/
- public function __call($method, $args)
+ public function getContainerClass()
{
- $container = $this->getContainer();
- if (method_exists($container, $method)) {
- $return = call_user_func_array(array($container, $method), $args);
- if ($return === $container) {
- // If the container is returned, we really want the current object
- return $this;
- }
- return $return;
- }
-
- throw new Exception\BadMethodCallException('Method "' . $method . '" does not exist');
+ return $this->containerClass;
}
/**
- * String representation
+ * Set Escaper instance
*
- * @return string
+ * @param Escaper $escaper
+ * @return AbstractStandalone
*/
- public function toString()
+ public function setEscaper(Escaper $escaper)
{
- return $this->getContainer()->toString();
+ $encoding = $escaper->getEncoding();
+ $this->escapers[$encoding] = $escaper;
+
+ return $this;
}
/**
- * Cast to string representation
+ * Get Escaper instance
*
- * @return string
+ * Lazy-loads one if none available
+ *
+ * @param string|null $enc Encoding to use
+ * @return mixed
*/
- public function __toString()
+ public function getEscaper($enc = 'UTF-8')
{
- return $this->toString();
+ $enc = strtolower($enc);
+ if (!isset($this->escapers[$enc])) {
+ $this->setEscaper(new Escaper($enc));
+ }
+
+ return $this->escapers[$enc];
}
/**
@@ -334,7 +366,7 @@ abstract class AbstractStandalone
/**
* IteratorAggregate: get Iterator
*
- * @return \Iterator
+ * @return Iterator
*/
public function getIterator()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php
index cb6ad672fc70ffead67dc44e02e13b0fac5483b5..4725ba0821afb79f741d1fb0b5cc8208ecfb4478 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php
@@ -17,18 +17,22 @@ use Zend\View\Exception;
class Registry
{
/**
- * @var Registry Singleton instance
+ * Singleton instance
+ *
+ * @var Registry
*/
protected static $instance;
/**
* Default container class
+ *
* @var string
*/
protected $containerClass = 'Zend\View\Helper\Placeholder\Container';
/**
* Placeholder containers
+ *
* @var array
*/
protected $items = array();
@@ -40,6 +44,7 @@ class Registry
*/
public static function getRegistry()
{
+ trigger_error('Placeholder view helpers should no longer use a singleton registry', E_USER_DEPRECATED);
if (null === static::$instance) {
static::$instance = new static();
}
@@ -56,22 +61,23 @@ class Registry
*/
public static function unsetRegistry()
{
+ trigger_error('Placeholder view helpers should no longer use a singleton registry', E_USER_DEPRECATED);
static::$instance = null;
}
/**
- * createContainer
+ * Set the container for an item in the registry
*
- * @param string $key
- * @param array $value
- * @return Container\AbstractContainer
+ * @param string $key
+ * @param Container\AbstractContainer $container
+ * @return Registry
*/
- public function createContainer($key, array $value = array())
+ public function setContainer($key, Container\AbstractContainer $container)
{
$key = (string) $key;
+ $this->items[$key] = $container;
- $this->items[$key] = new $this->containerClass($value);
- return $this->items[$key];
+ return $this;
}
/**
@@ -101,22 +107,24 @@ class Registry
public function containerExists($key)
{
$key = (string) $key;
- $return = array_key_exists($key, $this->items);
- return $return;
+
+ return array_key_exists($key, $this->items);
}
/**
- * Set the container for an item in the registry
+ * createContainer
*
* @param string $key
- * @param Container\AbstractContainer $container
- * @return Registry
+ * @param array $value
+ * @return Container\AbstractContainer
*/
- public function setContainer($key, Container\AbstractContainer $container)
+ public function createContainer($key, array $value = array())
{
$key = (string) $key;
- $this->items[$key] = $container;
- return $this;
+
+ $this->items[$key] = new $this->containerClass($value);
+
+ return $this->items[$key];
}
/**
@@ -159,6 +167,7 @@ class Registry
}
$this->containerClass = $name;
+
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php
index 153c767be8dbc56273105f6521e8dfaecee3b1e0..62fab196a2fc0613b3f28383a062d393afc52869 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php
@@ -21,11 +21,15 @@ use Zend\View\Model\ModelInterface as Model;
class RenderChildModel extends AbstractHelper
{
/**
- * @var Model Current view model
+ * Current view model
+ *
+ * @var Model
*/
protected $current;
/**
+ * View model helper instance
+ *
* @var ViewModel
*/
protected $viewModelHelper;
@@ -64,6 +68,7 @@ class RenderChildModel extends AbstractHelper
$return = $view->render($model);
$helper = $this->getViewModelHelper();
$helper->setCurrent($current);
+
return $return;
}
@@ -85,6 +90,7 @@ class RenderChildModel extends AbstractHelper
return $childModel;
}
}
+
return false;
}
@@ -103,6 +109,7 @@ class RenderChildModel extends AbstractHelper
__METHOD__
));
}
+
return $helper->getCurrent();
}
@@ -116,8 +123,11 @@ class RenderChildModel extends AbstractHelper
if ($this->viewModelHelper) {
return $this->viewModelHelper;
}
- $view = $this->getView();
- $this->viewModelHelper = $view->plugin('view_model');
+
+ if (method_exists($this->getView(), 'plugin')) {
+ $this->viewModelHelper = $this->view->plugin('view_model');
+ }
+
return $this->viewModelHelper;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php
index 305669e7795497ff2888a6291d165a1ebfa76428..048a9cb2c83eaa07a02a24664c22d4a29c05e945 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php
@@ -21,8 +21,8 @@ class RenderToPlaceholder extends AbstractHelper
* Renders a template and stores the rendered output as a placeholder
* variable for later use.
*
- * @param string|ModelInterface $script The template script to render
- * @param string $placeholder The placeholder variable name in which to store the rendered output
+ * @param string|ModelInterface $script The template script to render
+ * @param string $placeholder The placeholder variable name in which to store the rendered output
* @return void
*/
public function __invoke($script, $placeholder)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php
index 6dded929db1e1cb8bfc218d4a3c0e9108777fcbb..4cc0e7216e7232382604fc5d78b49629b92ee691 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php
@@ -14,6 +14,13 @@ namespace Zend\View\Helper;
*/
class ServerUrl extends AbstractHelper
{
+ /**
+ * Host (including port)
+ *
+ * @var string
+ */
+ protected $host;
+
/**
* Port
*
@@ -28,13 +35,6 @@ class ServerUrl extends AbstractHelper
*/
protected $scheme;
- /**
- * Host (including port)
- *
- * @var string
- */
- protected $host;
-
/**
* Whether or not to query proxy servers for address
*
@@ -51,7 +51,7 @@ class ServerUrl extends AbstractHelper
* as a path. If a string is given, it
* will be appended as a path. Default
* is to not append any path.
- * @return string server url
+ * @return string
*/
public function __invoke($requestUri = null)
{
@@ -66,103 +66,6 @@ class ServerUrl extends AbstractHelper
return $this->getScheme() . '://' . $this->getHost() . $path;
}
- /**
- * Returns host
- *
- * @return string host
- */
- public function getHost()
- {
- if (null === $this->host) {
- $this->detectHost();
- }
- return $this->host;
- }
-
- /**
- * Sets host
- *
- * @param string $host new host
- * @return \Zend\View\Helper\ServerUrl fluent interface, returns self
- */
- public function setHost($host)
- {
- $port = $this->getPort();
- $scheme = $this->getScheme();
-
- if (($scheme == 'http' && (null === $port || $port == 80))
- || ($scheme == 'https' && (null === $port || $port == 443))
- ) {
- $this->host = $host;
- return $this;
- }
-
- $this->host = $host . ':' . $port;
- return $this;
- }
-
- /**
- * Returns scheme (typically http or https)
- *
- * @return string scheme (typically http or https)
- */
- public function getScheme()
- {
- if (null === $this->scheme) {
- $this->detectScheme();
- }
- return $this->scheme;
- }
-
- /**
- * Sets scheme (typically http or https)
- *
- * @param string $scheme new scheme (typically http or https)
- * @return \Zend\View\Helper\ServerUrl fluent interface, returns self
- */
- public function setScheme($scheme)
- {
- $this->scheme = $scheme;
- return $this;
- }
-
- /**
- * Retrieve the server port
- *
- * @return int|null
- */
- public function getPort()
- {
- if (null === $this->port) {
- $this->detectPort();
- }
- return $this->port;
- }
-
- /**
- * Set server port
- *
- * @param int $port
- * @return ServerUrl
- */
- public function setPort($port)
- {
- $this->port = (int) $port;
- return $this;
- }
-
- /**
- * Set flag indicating whether or not to query proxy servers
- *
- * @param bool $useProxy
- * @return ServerUrl
- */
- public function setUseProxy($useProxy = false)
- {
- $this->useProxy = (bool) $useProxy;
- return $this;
- }
-
/**
* Detect the host based on headers
*
@@ -185,6 +88,7 @@ class ServerUrl extends AbstractHelper
}
$this->setHost($_SERVER['HTTP_HOST']);
+
return;
}
@@ -197,30 +101,20 @@ class ServerUrl extends AbstractHelper
}
/**
- * Detect if a proxy is in use, and, if so, set the host based on it
+ * Detect the port
*
- * @return bool
+ * @return null
*/
- protected function setHostFromProxy()
+ protected function detectPort()
{
- if (!$this->useProxy) {
- return false;
- }
-
- if (!isset($_SERVER['HTTP_X_FORWARDED_HOST']) || empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
- return false;
+ if ($this->setPortFromProxy()) {
+ return;
}
- $host = $_SERVER['HTTP_X_FORWARDED_HOST'];
- if (strpos($host, ',') !== false) {
- $hosts = explode(',', $host);
- $host = trim(array_pop($hosts));
- }
- if (empty($host)) {
- return false;
+ if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT']) {
+ $this->setPort($_SERVER['SERVER_PORT']);
+ return;
}
- $this->setHost($host);
- return true;
}
/**
@@ -244,24 +138,57 @@ class ServerUrl extends AbstractHelper
$scheme = 'http';
break;
}
+
$this->setScheme($scheme);
}
/**
- * Detect the port
+ * Detect if a proxy is in use, and, if so, set the host based on it
*
- * @return null
+ * @return bool
*/
- protected function detectPort()
+ protected function setHostFromProxy()
{
- if ($this->setPortFromProxy()) {
- return;
+ if (!$this->useProxy) {
+ return false;
}
- if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT']) {
- $this->setPort($_SERVER['SERVER_PORT']);
- return;
+ if (!isset($_SERVER['HTTP_X_FORWARDED_HOST']) || empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
+ return false;
+ }
+
+ $host = $_SERVER['HTTP_X_FORWARDED_HOST'];
+ if (strpos($host, ',') !== false) {
+ $hosts = explode(',', $host);
+ $host = trim(array_pop($hosts));
}
+ if (empty($host)) {
+ return false;
+ }
+ $this->setHost($host);
+
+ return true;
+ }
+
+ /**
+ * Set port based on detected proxy headers
+ *
+ * @return bool
+ */
+ protected function setPortFromProxy()
+ {
+ if (!$this->useProxy) {
+ return false;
+ }
+
+ if (!isset($_SERVER['HTTP_X_FORWARDED_PORT']) || empty($_SERVER['HTTP_X_FORWARDED_PORT'])) {
+ return false;
+ }
+
+ $port = $_SERVER['HTTP_X_FORWARDED_PORT'];
+ $this->setPort($port);
+
+ return true;
}
/**
@@ -291,27 +218,113 @@ class ServerUrl extends AbstractHelper
if (empty($scheme)) {
return false;
}
+
$this->setScheme($scheme);
+
return true;
}
/**
- * Set port based on detected proxy headers
+ * Sets host
*
- * @return bool
+ * @param string $host
+ * @return ServerUrl
*/
- protected function setPortFromProxy()
+ public function setHost($host)
{
- if (!$this->useProxy) {
- return false;
+ $port = $this->getPort();
+ $scheme = $this->getScheme();
+
+ if (($scheme == 'http' && (null === $port || $port == 80))
+ || ($scheme == 'https' && (null === $port || $port == 443))
+ ) {
+ $this->host = $host;
+ return $this;
}
- if (!isset($_SERVER['HTTP_X_FORWARDED_PORT']) || empty($_SERVER['HTTP_X_FORWARDED_PORT'])) {
- return false;
+ $this->host = $host . ':' . $port;
+
+ return $this;
+ }
+
+ /**
+ * Returns host
+ *
+ * @return string
+ */
+ public function getHost()
+ {
+ if (null === $this->host) {
+ $this->detectHost();
}
- $port = $_SERVER['HTTP_X_FORWARDED_PORT'];
- $this->setPort($port);
- return true;
+ return $this->host;
+ }
+
+ /**
+ * Set server port
+ *
+ * @param int $port
+ * @return ServerUrl
+ */
+ public function setPort($port)
+ {
+ $this->port = (int) $port;
+
+ return $this;
+ }
+
+ /**
+ * Retrieve the server port
+ *
+ * @return int|null
+ */
+ public function getPort()
+ {
+ if (null === $this->port) {
+ $this->detectPort();
+ }
+
+ return $this->port;
+ }
+
+ /**
+ * Sets scheme (typically http or https)
+ *
+ * @param string $scheme
+ * @return ServerUrl
+ */
+ public function setScheme($scheme)
+ {
+ $this->scheme = $scheme;
+
+ return $this;
+ }
+
+ /**
+ * Returns scheme (typically http or https)
+ *
+ * @return string
+ */
+ public function getScheme()
+ {
+ if (null === $this->scheme) {
+ $this->detectScheme();
+ }
+
+ return $this->scheme;
+ }
+
+ /**
+ * Set flag indicating whether or not to query proxy servers
+ *
+ * @param bool $useProxy
+ * @return ServerUrl
+ */
+ public function setUseProxy($useProxy = false)
+ {
+ $this->useProxy = (bool) $useProxy;
+
+ return $this;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php
index 7838513b4ca2d3e81154ddab677666e54cd9a3a0..b25d80c548314ba5b8f66189c495e44819e476cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php
@@ -15,6 +15,12 @@ use Zend\View\Helper\FlashMessenger;
class FlashMessengerFactory implements FactoryInterface
{
+ /**
+ * Create service
+ *
+ * @param ServiceLocatorInterface $serviceLocator
+ * @return FlashMessenger
+ */
public function createService(ServiceLocatorInterface $serviceLocator)
{
$serviceLocator = $serviceLocator->getServiceLocator();
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/IdentityFactory.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/IdentityFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..f7b1750a5b798e5e16566f15e44f4cbd9512496a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/IdentityFactory.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\View\Helper\Service;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\Helper\Identity;
+
+class IdentityFactory implements FactoryInterface
+{
+ /**
+ * {@inheritDoc}
+ *
+ * @return \Zend\View\Helper\Identity
+ */
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ $services = $serviceLocator->getServiceLocator();
+ $helper = new Identity();
+ if ($services->has('Zend\Authentication\AuthenticationService')) {
+ $helper->setAuthenticationService($services->get('Zend\Authentication\AuthenticationService'));
+ }
+ return $helper;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php
index 6cba9cebfcce05f8ad928fa2cbb68a2b1af253ee..86629a16187f28b9df38a5a32e6e0d8fc590a4ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php
@@ -9,10 +9,13 @@
namespace Zend\View\Helper;
+use Traversable;
use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\Router\RouteMatch;
use Zend\Mvc\Router\RouteStackInterface;
+use Zend\Stdlib\ArrayUtils;
use Zend\View\Exception;
+use Zend\Stdlib\Exception as StdlibException;
/**
* Helper for making easy links and getting urls that depend on the routes and router.
@@ -33,44 +36,21 @@ class Url extends AbstractHelper
*/
protected $routeMatch;
- /**
- * Set the router to use for assembling.
- *
- * @param RouteStackInterface $router
- * @return Url
- */
- public function setRouter(RouteStackInterface $router)
- {
- $this->router = $router;
- return $this;
- }
-
- /**
- * Set route match returned by the router.
- *
- * @param RouteMatch $routeMatch
- * @return self
- */
- public function setRouteMatch(RouteMatch $routeMatch)
- {
- $this->routeMatch = $routeMatch;
- return $this;
- }
-
/**
* Generates an url given the name of a route.
*
* @see Zend\Mvc\Router\RouteInterface::assemble()
- * @param string $name Name of the route
- * @param array $params Parameters for the link
- * @param array $options Options for the route
- * @param bool $reuseMatchedParams Whether to reuse matched parameters
- * @return string Url For the link href attribute
- * @throws Exception\RuntimeException If no RouteStackInterface was provided
- * @throws Exception\RuntimeException If no RouteMatch was provided
- * @throws Exception\RuntimeException If RouteMatch didn't contain a matched route name
+ * @param string $name Name of the route
+ * @param array $params Parameters for the link
+ * @param array|Traversable $options Options for the route
+ * @param bool $reuseMatchedParams Whether to reuse matched parameters
+ * @return string Url For the link href attribute
+ * @throws Exception\RuntimeException If no RouteStackInterface was provided
+ * @throws Exception\RuntimeException If no RouteMatch was provided
+ * @throws Exception\RuntimeException If RouteMatch didn't contain a matched route name
+ * @throws Exception\InvalidArgumentException If the params object was not an array or \Traversable object
*/
- public function __invoke($name = null, array $params = array(), $options = array(), $reuseMatchedParams = false)
+ public function __invoke($name = null, $params = array(), $options = array(), $reuseMatchedParams = false)
{
if (null === $this->router) {
throw new Exception\RuntimeException('No RouteStackInterface instance provided');
@@ -93,6 +73,15 @@ class Url extends AbstractHelper
}
}
+ if (!is_array($params)) {
+ if (!$params instanceof Traversable) {
+ throw new Exception\InvalidArgumentException(
+ 'Params is expected to be an array or a Traversable object'
+ );
+ }
+ $params = iterator_to_array($params);
+ }
+
if ($reuseMatchedParams && $this->routeMatch !== null) {
$routeMatchParams = $this->routeMatch->getParams();
@@ -112,4 +101,28 @@ class Url extends AbstractHelper
return $this->router->assemble($params, $options);
}
+
+ /**
+ * Set the router to use for assembling.
+ *
+ * @param RouteStackInterface $router
+ * @return Url
+ */
+ public function setRouter(RouteStackInterface $router)
+ {
+ $this->router = $router;
+ return $this;
+ }
+
+ /**
+ * Set route match returned by the router.
+ *
+ * @param RouteMatch $routeMatch
+ * @return Url
+ */
+ public function setRouteMatch(RouteMatch $routeMatch)
+ {
+ $this->routeMatch = $routeMatch;
+ return $this;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php
index 264fc9582c4ae8786df2a5f52c7bd9d466634aca..f183df3967bd8ec9cb83a41b07a3e4538384739c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php
@@ -27,23 +27,15 @@ class ViewModel extends AbstractHelper
protected $root;
/**
- * Get the root view model
- *
- * @return null|Model
- */
- public function getRoot()
- {
- return $this->root;
- }
-
- /**
- * Is a root view model composed?
+ * Set the current view model
*
- * @return bool
+ * @param Model $model
+ * @return ViewModel
*/
- public function hasRoot()
+ public function setCurrent(Model $model)
{
- return ($this->root instanceof Model);
+ $this->current = $model;
+ return $this;
}
/**
@@ -79,14 +71,22 @@ class ViewModel extends AbstractHelper
}
/**
- * Set the current view model
+ * Get the root view model
*
- * @param Model $model
- * @return ViewModel
+ * @return null|Model
*/
- public function setCurrent(Model $model)
+ public function getRoot()
{
- $this->current = $model;
- return $this;
+ return $this->root;
+ }
+
+ /**
+ * Is a root view model composed?
+ *
+ * @return bool
+ */
+ public function hasRoot()
+ {
+ return ($this->root instanceof Model);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php b/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
index d5e045c4bb86398a0523b826ac3a91f22ab6a5cf..02d9ef85d1afcc9eab538824967e9948f6b03f5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
@@ -28,7 +28,8 @@ class HelperPluginManager extends AbstractPluginManager
* @var array
*/
protected $factories = array(
- 'flashmessenger' => 'Zend\View\Helper\Service\FlashMessengerFactory',
+ 'flashmessenger' => 'Zend\View\Helper\Service\FlashMessengerFactory',
+ 'identity' => 'Zend\View\Helper\Service\IdentityFactory',
);
/**
@@ -92,16 +93,6 @@ class HelperPluginManager extends AbstractPluginManager
{
parent::__construct($configuration);
- $this->setFactory('identity', function ($helpers) {
- $services = $helpers->getServiceLocator();
- $helper = new Helper\Identity();
- if (!$services->has('Zend\Authentication\AuthenticationService')) {
- return $helper;
- }
- $helper->setAuthenticationService($services->get('Zend\Authentication\AuthenticationService'));
- return $helper;
- });
-
$this->addInitializer(array($this, 'injectRenderer'))
->addInitializer(array($this, 'injectTranslator'));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php b/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php
index c5ebb487d17df611fb4e84ab192e33e1121de58f..980c84b866daec421689e55c8eaa98483aa0533c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php
@@ -105,6 +105,9 @@ class TemplatePathStack implements ResolverInterface
case 'use_stream_wrapper':
$this->setUseStreamWrapper($value);
break;
+ case 'default_suffix':
+ $this->setDefaultSuffix($value);
+ break;
default:
break;
}
@@ -296,7 +299,7 @@ class TemplatePathStack implements ResolverInterface
// Ensure we have the expected file extension
$defaultSuffix = $this->getDefaultSuffix();
- if (pathinfo($name, PATHINFO_EXTENSION) != $defaultSuffix) {;
+ if (pathinfo($name, PATHINFO_EXTENSION) == '') {
$name .= '.' . $defaultSuffix;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php
index 57545f06f7f16966d821196223c79f1b9dcdeecc..9072d4c76e7857b4dd8187e6e9657cb6bc786877 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php
@@ -9,21 +9,16 @@
namespace Zend\View\Strategy;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Feed\Writer\Feed;
use Zend\Http\Request as HttpRequest;
use Zend\View\Model;
use Zend\View\Renderer\FeedRenderer;
use Zend\View\ViewEvent;
-class FeedStrategy implements ListenerAggregateInterface
+class FeedStrategy extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* @var FeedRenderer
*/
@@ -40,11 +35,7 @@ class FeedStrategy implements ListenerAggregateInterface
}
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
@@ -52,21 +43,6 @@ class FeedStrategy implements ListenerAggregateInterface
$this->listeners[] = $events->attach(ViewEvent::EVENT_RESPONSE, array($this, 'injectResponse'), $priority);
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Detect if we should use the FeedRenderer based on model type and/or
* Accept header
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php
index 4a2be49d24fa23620ab8bb41f83ae5fdcd4b071b..49d7860a5f18334b7367ee9b7f2a9404f48d4b46 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php
@@ -9,14 +9,14 @@
namespace Zend\View\Strategy;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Http\Request as HttpRequest;
use Zend\View\Model;
use Zend\View\Renderer\JsonRenderer;
use Zend\View\ViewEvent;
-class JsonStrategy implements ListenerAggregateInterface
+class JsonStrategy extends AbstractListenerAggregate
{
/**
* Character set for associated content-type
@@ -25,11 +25,6 @@ class JsonStrategy implements ListenerAggregateInterface
*/
protected $charset = 'utf-8';
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* Multibyte character sets that will trigger a binary content-transfer-encoding
*
@@ -56,11 +51,7 @@ class JsonStrategy implements ListenerAggregateInterface
}
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
@@ -68,21 +59,6 @@ class JsonStrategy implements ListenerAggregateInterface
$this->listeners[] = $events->attach(ViewEvent::EVENT_RESPONSE, array($this, 'injectResponse'), $priority);
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Set the content-type character set
*
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php
index 92fe5d9d9a97105c5758ff0dddc20aa4777fb9ef..2a8db5d2b7b4269f5cf14333160758ab577b8766 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php
@@ -9,18 +9,13 @@
namespace Zend\View\Strategy;
+use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\View\Renderer\PhpRenderer;
use Zend\View\ViewEvent;
-class PhpRendererStrategy implements ListenerAggregateInterface
+class PhpRendererStrategy extends AbstractListenerAggregate
{
- /**
- * @var \Zend\Stdlib\CallbackHandler[]
- */
- protected $listeners = array();
-
/**
* Placeholders that may hold content
*
@@ -76,11 +71,7 @@ class PhpRendererStrategy implements ListenerAggregateInterface
}
/**
- * Attach the aggregate to the specified event manager
- *
- * @param EventManagerInterface $events
- * @param int $priority
- * @return void
+ * {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
@@ -88,21 +79,6 @@ class PhpRendererStrategy implements ListenerAggregateInterface
$this->listeners[] = $events->attach(ViewEvent::EVENT_RESPONSE, array($this, 'injectResponse'), $priority);
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Select the PhpRenderer; typically, this will be registered last or at
* low priority.
@@ -139,10 +115,9 @@ class PhpRendererStrategy implements ListenerAggregateInterface
// populated, and set the content from them.
if (empty($result)) {
$placeholders = $renderer->plugin('placeholder');
- $registry = $placeholders->getRegistry();
foreach ($this->contentPlaceholders as $placeholder) {
- if ($registry->containerExists($placeholder)) {
- $result = (string) $registry->getContainer($placeholder);
+ if ($placeholders->containerExists($placeholder)) {
+ $result = (string) $placeholders->getContainer($placeholder);
break;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Stream.php b/vendor/zendframework/zendframework/library/Zend/View/Stream.php
index f9f673332a46d72b50db9d0ae39000a941a3cd92..915382b83bcf0fda26e6a7c529afcc8404df8357 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Stream.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Stream.php
@@ -48,6 +48,10 @@ class Stream
/**
* Opens the script file and converts markup.
*
+ * @param string $path
+ * @param $mode
+ * @param $options
+ * @param $opened_path
* @return bool
*/
public function stream_open($path, $mode, $options, &$opened_path)
@@ -95,7 +99,8 @@ class Stream
/**
* Reads from the stream.
*
- * @return string|false
+ * @param int $count
+ * @return string
*/
public function stream_read($count)
{
@@ -141,6 +146,8 @@ class Stream
/**
* Seek to a specific point in the stream.
*
+ * @param $offset
+ * @param $whence
* @return bool
*/
public function stream_seek($offset, $whence)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/composer.json b/vendor/zendframework/zendframework/library/Zend/View/composer.json
index 6982ec17d288e59ee59bf32279ceb3d183d7d177..d61c03a81ce80aa611466673082599a5f3eb0876 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/View/composer.json
@@ -24,8 +24,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json b/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json
index 65aa363c04c214314ec78c356159f4eddda62781..62727df81b639b1a906716d8c11886986dea2bab 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json
@@ -21,8 +21,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev",
- "dev-develop": "2.2-dev"
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
new file mode 100644
index 0000000000000000000000000000000000000000..6288ab9e1e894b31a8e121f56df94e1171408ed3
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * ZH-Revision: 26.Apr.2013
+ */
+return array(
+ // Zend_Captcha_ReCaptcha
+ "Missing captcha fields" => "沒有找到驗è‰ç¢¼å€åŸŸ",
+ "Failed to validate captcha" => "é©—è‰ç¢¼æ ¡é©—失敗",
+ "Captcha value is wrong: %value%" => "é©—è‰ç¢¼ä¸åŒ¹é…: %value%",
+
+ // Zend_Captcha_Word
+ "Empty captcha value" => "請輸入驗è‰ç¢¼",
+ "Captcha ID field is missing" => "沒有找到驗è‰ç¢¼å€åŸŸ",
+ "Captcha value is wrong" => "é©—è‰ç¢¼ä¸åŒ¹é…",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e0da9faeef767e7c3eb71f004abfa4b95bee399
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * ZH-Revision: 26.Apr.2013
+ */
+return array(
+ // Zend_I18n_Validator_Alnum
+ "Invalid type given. String, integer or float expected" => "請輸入一個整數或å°æ•¸",
+ "The input contains characters which are non alphabetic and no digits" => "輸入ä¸èƒ½ç‚ºå—æ¯æ•¸å—以外的å—符",
+ "The input is an empty string" => "輸入ä¸èƒ½ç‚ºç©º",
+
+ // Zend_I18n_Validator_Alpha
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input contains non alphabetic characters" => "輸入ä¸èƒ½ç‚ºå—æ¯ä»¥å¤–çš„å—符",
+ "The input is an empty string" => "輸入ä¸èƒ½ç‚ºç©º",
+
+ // Zend_I18n_Validator_Float
+ "Invalid type given. String, integer or float expected" => "請輸入與一個整數或å°æ•¸",
+ "The input does not appear to be a float" => "輸入無效，請輸入一個å°æ•¸",
+
+ // Zend_I18n_Validator_Int
+ "Invalid type given. String or integer expected" => "輸入無效，請輸入å—符或數å—",
+ "The input does not appear to be an integer" => "請輸入一個整數",
+
+ // Zend_I18n_Validator_PostCode
+ "Invalid type given. String or integer expected" => "輸入無效，請輸入一個å—符或數å—",
+ "The input does not appear to be a postal code" => "ç„¡æ•ˆçš„éƒµæ”¿ç·¨ç¢¼æ ¼å¼",
+ "An exception has been raised while validating the input" => "é©—è‰è¼¸å…¥æ™‚有異常發生",
+
+ // Zend_Validator_Barcode
+ "The input failed checksum validation" => "輸入的æ¢ç¢¼ç„¡æ³•é€šéŽæ ¡é©—",
+ "The input contains invalid characters" => "輸入的æ¢ç¢¼åŒ…å«ç„¡æ•ˆçš„å—符",
+ "The input should have a length of %length% characters" => "輸入的æ¢ç¢¼é•·åº¦æ‡‰ç‚º%length%個å—符",
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+
+ // Zend_Validator_Between
+ "The input is not between '%min%' and '%max%', inclusively" => "請輸入大於ç‰æ–¼'%min%'並å°æ–¼ç‰æ–¼'%max%'的值",
+ "The input is not strictly between '%min%' and '%max%'" => "請輸入大於'%min%'並å°æ–¼'%max%'的值",
+
+ // Zend_Validator_Callback
+ "The input is not valid" => "輸入無效",
+ "An exception has been raised within the callback" => "回調ä¸æœ‰ç•°å¸¸ç™¼ç”Ÿ",
+
+ // Zend_Validator_CreditCard
+ "The input seems to contain an invalid checksum" => "輸入的å¡è™Ÿæ ¼å¼æœ‰èª¤",
+ "The input must contain only digits" => "å¡è™Ÿæ‡‰ç‚ºæ•¸å—",
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input contains an invalid amount of digits" => "輸入的å¡è™Ÿé•·åº¦æœ‰èª¤",
+ "The input is not from an allowed institute" => "輸入的å¡è™Ÿæ²’有找到å°æ‡‰çš„發行機構",
+ "The input seems to be an invalid creditcard number" => "輸入的å¡è™Ÿç„¡æ³•é€šéŽæ ¡é©—",
+ "An exception has been raised while validating the input" => "é©—è‰è¼¸å…¥æ™‚有異常發生",
+
+ // Zend_Validator_Csrf
+ "The form submitted did not originate from the expected site" => "表單æ交來æºç¶²ç«™æœªç¶“éŽè¨±å¯",
+
+ // Zend_Validator_Date
+ "Invalid type given. String, integer, array or DateTime expected" => "輸入無效，請輸入å—符數å—或日期",
+ "The input does not appear to be a valid date" => "è¼¸å…¥çš„æ—¥æœŸæ ¼å¼ç„¡æ•ˆ",
+ "The input does not fit the date format '%format%'" => "è«‹æŒ‰ç…§æ—¥æœŸæ ¼å¼'%format%'輸入一個日期",
+
+ // Zend_Validator_DateStep
+ "Invalid type given. String, integer, array or DateTime expected" => "輸入無效，請輸入å—符數å—或日期",
+ "The input does not appear to be a valid date" => "è¼¸å…¥çš„æ—¥æœŸæ ¼å¼ç„¡æ•ˆ",
+ "The input is not a valid step" => "The input is not a valid step",
+
+ // Zend_Validator_Db_AbstractDb
+ "No record matching the input was found" => "沒有找到匹é…輸入的記錄",
+ "A record matching the input was found" => "輸入已經被å 用",
+
+ // Zend_Validator_Digits
+ "The input must contain only digits" => "輸入ä¸èƒ½ç‚ºæ•¸å—以外的å—符",
+ "The input is an empty string" => "輸入ä¸èƒ½ç‚ºç©º",
+ "Invalid type given. String, integer or float expected" => "輸入無效，請輸入å—符整數或å°æ•¸",
+
+ // Zend_Validator_EmailAddress
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input is not a valid email address. Use the basic format local-part@hostname" => "輸入郵件地å€æ ¼å¼æœ‰èª¤ï¼Œè«‹æª¢æŸ¥æ ¼å¼æ˜¯å¦ç‚ºlocal-part@hostname",
+ "'%hostname%' is not a valid hostname for the email address" => "'%hostname%'ä¸æ˜¯ä¸€å€‹å¯ç”¨çš„郵件域å",
+ "'%hostname%' does not appear to have any valid MX or A records for the email address" => "'%hostname%'域å下沒有找到å¯ç”¨çš„MX或A記錄，郵件無法投éž",
+ "'%hostname%' is not in a routable network segment. The email address should not be resolved from public network" => "'%hostname%'域å所在網段無法被路由，郵件地å€æ‡‰ä½æ–¼å…¬å…±ç¶²çµ¡",
+ "'%localPart%' can not be matched against dot-atom format" => "郵件用戶å部分'%localPart%'æ ¼å¼ç„¡æ³•åŒ¹é…dot-atomæ ¼å¼",
+ "'%localPart%' can not be matched against quoted-string format" => "郵件用戶å部分'%localPart%'æ ¼å¼ç„¡æ³•åŒ¹é…quoted-stringæ ¼å¼",
+ "'%localPart%' is not a valid local part for the email address" => "'%localPart%'ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„郵件用戶å",
+ "The input exceeds the allowed length" => "輸入超出å…許長度",
+
+ // Zend_Validator_Explode
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+
+ // Zend_Validator_File_Count
+ "Too many files, maximum '%max%' are allowed but '%count%' are given" => "文件éŽå¤šï¼Œæœ€å¤šå…許'%max%'個文件，找到'%count%'個",
+ "Too few files, minimum '%min%' are expected but '%count%' are given" => "文件éŽå°‘，至少需è¦'%min%'個文件，找到'%count%'個",
+
+ // Zend_Validator_File_Crc32
+ "File '%value%' does not match the given crc32 hashes" => "文件'%value%'無法通éŽCRC32æ ¡é©—",
+ "A crc32 hash could not be evaluated for the given file" => "文件無法生æˆCRC32æ ¡é©—ç¢¼",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_ExcludeExtension
+ "File '%value%' has a false extension" => "文件'%value%'擴展åä¸å…許",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_Exists
+ "File '%value%' does not exist" => "文件'%value%'ä¸å˜åœ¨",
+
+ // Zend_Validator_File_Extension
+ "File '%value%' has a false extension" => "文件'%value%'擴展åä¸å…許",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_FilesSize
+ "All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "所有文件總大å°'%size%'超出，最大å…許'%max%'",
+ "All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "所有文件總大å°'%size%'ä¸è¶³ï¼Œè‡³å°‘需è¦'%min%'",
+ "One or more files can not be read" => "一個或多個文件無法讀å–",
+
+ // Zend_Validator_File_Hash
+ "File '%value%' does not match the given hashes" => "文件'%value%'無法通éŽå“ˆå¸Œæ ¡é©—",
+ "A hash could not be evaluated for the given file" => "文件無法生æˆå“ˆå¸Œæ ¡é©—碼",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_ImageSize
+ "Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected" => "圖片'%value%'的寬度'%width%'超出，最大å…許'%maxwidth%'",
+ "Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected" => "圖片'%value%'的寬度'%width%'ä¸è¶³ï¼Œè‡³å°‘應為'%minwidth%'",
+ "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected" => "圖片'%value%'的高度'%height%'超出，最大å…許'%maxheight%'",
+ "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected" => "圖片'%value%'的高度'%height%'ä¸è¶³ï¼Œè‡³å°‘應為'%minheight%'",
+ "The size of image '%value%' could not be detected" => "圖片'%value%'的尺寸無法讀å–",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_IsCompressed
+ "File '%value%' is not compressed, '%type%' detected" => "文件'%value%'沒有被壓縮，檢測到文件的媒體類型為'%type%'",
+ "The mimetype of file '%value%' could not be detected" => "文件'%value%'的媒體類型無法檢測",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_IsImage
+ "File '%value%' is no image, '%type%' detected" => "文件'%value%'ä¸æ˜¯åœ–片，檢測到文件的媒體類型為'%type%'",
+ "The mimetype of file '%value%' could not be detected" => "文件'%value%'的媒體類型無法檢測",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_Md5
+ "File '%value%' does not match the given md5 hashes" => "文件'%value%'無法通éŽMD5æ ¡é©—",
+ "A md5 hash could not be evaluated for the given file" => "文件無法生æˆMD5æ ¡é©—ç¢¼",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_MimeType
+ "File '%value%' has a false mimetype of '%type%'" => "文件'%value%'的媒體類型'%type%'ä¸å…許",
+ "The mimetype of file '%value%' could not be detected" => "文件'%value%'的媒體類型無法檢測",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_NotExists
+ "File '%value%' exists" => "文件'%value%'已經å˜åœ¨",
+
+ // Zend_Validator_File_Sha1
+ "File '%value%' does not match the given sha1 hashes" => "文件'%value%'無法通éŽSHA1æ ¡é©—",
+ "A sha1 hash could not be evaluated for the given file" => "文件無法生æˆSHA1æ ¡é©—ç¢¼",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_Size
+ "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected" => "文件'%value%'的大å°'%size%'超出，最大å…許'%max%'",
+ "Minimum expected size for file '%value%' is '%min%' but '%size%' detected" => "文件'%value%'的大å°'%size%'ä¸è¶³ï¼Œè‡³å°‘需è¦'%min%'",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_File_Upload
+ "File '%value%' exceeds the defined ini size" => "文件'%value%'大å°è¶…出系統å…許範åœ",
+ "File '%value%' exceeds the defined form size" => "文件'%value%'大å°è¶…出表單å…許範åœ",
+ "File '%value%' was only partially uploaded" => "文件'%value%'上傳ä¸å®Œæ•´",
+ "File '%value%' was not uploaded" => "文件'%value%'沒有被上傳",
+ "No temporary directory was found for file '%value%'" => "沒有找到臨時文件夾å˜æ”¾æ–‡ä»¶'%value%'",
+ "File '%value%' can't be written" => "文件'%value%'無法被寫入",
+ "A PHP extension returned an error while uploading the file '%value%'" => "文件'%value%'上傳時發生了一個PHP擴展錯誤",
+ "File '%value%' was illegally uploaded. This could be a possible attack" => "文件'%value%'被éžæ³•ä¸Šå‚³ï¼Œé€™å¯èƒ½è¢«åˆ¤å®šç‚ºä¸€æ¬¡å…¥ä¾µ",
+ "File '%value%' was not found" => "文件'%value%'ä¸å˜åœ¨",
+ "Unknown error while uploading file '%value%'" => "文件'%value%'上傳時發生了一個未知錯誤",
+
+ // Zend_Validator_File_WordCount
+ "Too much words, maximum '%max%' are allowed but '%count%' were counted" => "輸入的單詞éŽå¤šï¼Œæœ€å¤šå…許'%max%'個單詞，輸入了'%count%'個",
+ "Too few words, minimum '%min%' are expected but '%count%' were counted" => "輸入的單詞éŽå°‘，至少需è¦'%min%'個單詞，輸入了'%count%'個",
+ "File '%value%' is not readable or does not exist" => "文件'%value%'無法讀å–或ä¸å˜åœ¨",
+
+ // Zend_Validator_GreaterThan
+ "The input is not greater than '%min%'" => "輸入應大於'%min%'",
+ "The input is not greater or equal than '%min%'" => "輸入應大於ç‰æ–¼'%min%'",
+
+ // Zend_Validator_Hex
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input contains non-hexadecimal characters" => "請輸入åå…進制å…許的å—符",
+
+ // Zend_Validator_Hostname
+ "The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "輸入的DNS域å在解æžä¸ç„¡æ³•ç”¨çµ¦å®šçš„punycodeæ£ç¢ºè§£ç¢¼",
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input appears to be a DNS hostname but contains a dash in an invalid position" => "輸入的DNS域åä¸é€£æŽ¥ç¬¦ä½ç½®ä¸ç¬¦åˆè¦å®š",
+ "The input does not match the expected structure for a DNS hostname" => "輸入的DNS域åçµæ§‹çµ„æˆæœ‰èª¤",
+ "The input appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "輸入的DNS域åçš„é ‚ç´šåŸŸå'%tld%'無法被解æž",
+ "The input does not appear to be a valid local network name" => "輸入域åä¸æ˜¯ä¸€å€‹æœ¬åœ°åŸŸå",
+ "The input does not appear to be a valid URI hostname" => "域åæ ¼å¼æœ‰èª¤",
+ "The input appears to be an IP address, but IP addresses are not allowed" => "ä¸å…許輸入IP地å€ä½œç‚ºåŸŸå",
+ "The input appears to be a local network name but local network names are not allowed" => "ä¸å…許輸入本地或局域網內域å",
+ "The input appears to be a DNS hostname but cannot extract TLD part" => "在輸入的DNS域åä¸ç„¡æ³•æ‰¾åˆ°é ‚級域å部分",
+ "The input appears to be a DNS hostname but cannot match TLD against known list" => "在輸入的DNS域åä¸ï¼Œé ‚級域å部分無法匹é…已知列表",
+
+ // Zend_Validator_Iban
+ "Unknown country within the IBAN" => "輸入的IBAN帳號無法找到å°æ‡‰çš„國家",
+ "Countries outside the Single Euro Payments Area (SEPA) are not supported" => "ä¸æ”¯æŒå–®ä¸€æ元支付å€(SEPA)以外的帳號",
+ "The input has a false IBAN format" => "輸入的IBANå¸³è™Ÿæ ¼å¼æœ‰èª¤",
+ "The input has failed the IBAN check" => "輸入的IBANå¸³è™Ÿæ ¡é©—å¤±æ•—",
+
+ // Zend_Validator_Identical
+ "The two given tokens do not match" => "兩個驗è‰ä»¤ç‰Œä¸åŒ¹é…",
+ "No token was provided to match against" => "沒有令牌輸入，無法匹é…",
+
+ // Zend_Validator_InArray
+ "The input was not found in the haystack" => "輸入沒有在指定的å…許範åœå…§",
+
+ // Zend_Validator_Ip
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input does not appear to be a valid IP address" => "輸入的IP地å€æ ¼å¼ä¸æ£ç¢º",
+
+ // Zend_Validator_Isbn
+ "Invalid type given. String or integer expected" => "輸入無效，請輸入å—符或整數",
+ "The input is not a valid ISBN number" => "輸入的ISBNç·¨è™Ÿæ ¼å¼ä¸æ£ç¢º",
+
+ // Zend_Validator_LessThan
+ "The input is not less than '%max%'" => "輸入應å°æ–¼'%max%'",
+ "The input is not less or equal than '%max%'" => "輸入應å°æ–¼ç‰æ–¼'%max%'",
+
+ // Zend_Validator_NotEmpty
+ "Value is required and can't be empty" => "輸入ä¸èƒ½ç‚ºç©º",
+ "Invalid type given. String, integer, float, boolean or array expected" => "輸入無效，åªå…許å—符ã€æ•´æ•¸ã€å°æ•¸ã€å¸ƒçˆ¾å€¼ã€æ•¸çµ„é¡žåž‹",
+
+ // Zend_Validator_Regex
+ "Invalid type given. String, integer or float expected" => "輸入無效，請輸入å—符ã€æ•´æ•¸æˆ–å°æ•¸",
+ "The input does not match against pattern '%pattern%'" => "輸入ä¸åŒ¹é…指定的模å¼'%pattern%'",
+ "There was an internal error while using the pattern '%pattern%'" => "匹é…指定模å¼'%pattern%'時有內部錯誤發生",
+
+ // Zend_Validator_Sitemap_Changefreq
+ "The input is not a valid sitemap changefreq" => "輸入ä¸ç¬¦åˆç¶²ç«™åœ°åœ–çš„changefreqæ ¼å¼",
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+
+ // Zend_Validator_Sitemap_Lastmod
+ "The input is not a valid sitemap lastmod" => "輸入ä¸ç¬¦åˆç¶²ç«™åœ°åœ–çš„lastmodæ ¼å¼",
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+
+ // Zend_Validator_Sitemap_Loc
+ "The input is not a valid sitemap location" => "輸入ä¸ç¬¦åˆç¶²ç«™åœ°åœ–çš„locationæ ¼å¼",
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+
+ // Zend_Validator_Sitemap_Priority
+ "The input is not a valid sitemap priority" => "輸入ä¸ç¬¦åˆç¶²ç«™åœ°åœ–çš„priorityæ ¼å¼",
+ "Invalid type given. Numeric string, integer or float expected" => "輸入無效，請輸入一個數å—",
+
+ // Zend_Validator_Step
+ "Invalid value given. Scalar expected" => "輸入無效，請輸入一個數å—",
+ "The input is not a valid step" => "輸入ä¸åœ¨éšŽæ¢¯è¨ˆç®—çš„çµæžœç¯„åœå…§",
+
+ // Zend_Validator_StringLength
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input is less than %min% characters long" => "輸入å—符個數應大於%min%",
+ "The input is more than %max% characters long" => "輸入å—符個數應å°æ–¼%max%",
+
+ // Zend_Validator_Uri
+ "Invalid type given. String expected" => "輸入無效，請輸入一個å—符串",
+ "The input does not appear to be a valid Uri" => "輸入的Uriæ ¼å¼æœ‰èª¤",
+);