diff --git a/composer.json b/composer.json index 6d70605..45220ac 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "symfony-cmf/routing": "1.1.*@alpha", "easyrdf/easyrdf": "0.8.*@beta", "phpunit/phpunit": "3.7.*", - "zendframework/zend-feed": "2.2.*@rc" + "zendframework/zend-feed": ">=2.2.0" }, "autoload": { "psr-0": { diff --git a/composer.lock b/composer.lock index c047f53..3f8c9af 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": "731a3a6f739084fea133ab02e4c7e4b0", + "hash": "c6c28f0a18709e873f7e86c427a7eea8", "packages": [ { "name": "doctrine/common", @@ -1483,17 +1483,17 @@ }, { "name": "zendframework/zend-escaper", - "version": "2.2.0rc3", + "version": "dev-master", "target-dir": "Zend/Escaper", "source": { "type": "git", "url": "https://github.com/zendframework/Component_ZendEscaper.git", - "reference": "release-2.2.0rc3" + "reference": "release-2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/release-2.2.0rc3", - "reference": "release-2.2.0rc3", + "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/release-2.2.1", + "reference": "release-2.2.1", "shasum": "" }, "require": { @@ -1523,17 +1523,17 @@ }, { "name": "zendframework/zend-feed", - "version": "2.2.0rc3", + "version": "dev-master", "target-dir": "Zend/Feed", "source": { "type": "git", "url": "https://github.com/zendframework/Component_ZendFeed.git", - "reference": "release-2.2.0rc3" + "reference": "release-2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/release-2.2.0rc3", - "reference": "release-2.2.0rc3", + "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/release-2.2.1", + "reference": "release-2.2.1", "shasum": "" }, "require": { @@ -1567,21 +1567,21 @@ "feed", "zf2" ], - "time": "2013-05-09 21:00:10" + "time": "2013-06-12 19:45:31" }, { "name": "zendframework/zend-stdlib", - "version": "2.2.0rc3", + "version": "dev-master", "target-dir": "Zend/Stdlib", "source": { "type": "git", "url": "https://github.com/zendframework/Component_ZendStdlib.git", - "reference": "release-2.2.0rc3" + "reference": "release-2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/release-2.2.0rc3", - "reference": "release-2.2.0rc3", + "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/release-2.2.1", + "reference": "release-2.2.1", "shasum": "" }, "require": { @@ -1611,7 +1611,7 @@ "stdlib", "zf2" ], - "time": "2013-05-09 18:00:17" + "time": "2013-06-12 19:46:58" } ], "packages-dev": [ @@ -1624,8 +1624,7 @@ "stability-flags": { "kriswallsmith/assetic": 15, "symfony-cmf/routing": 15, - "easyrdf/easyrdf": 10, - "zendframework/zend-feed": 5 + "easyrdf/easyrdf": 10 }, "platform": [ diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php index f97e704..2fcf798 100644 --- a/core/vendor/autoload.php +++ b/core/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit75c14c1e390c464828dc7e7f642e6ec3::getLoader(); +return ComposerAutoloaderInit30d2fb8689de6a67010ce67466576f03::getLoader(); diff --git a/core/vendor/composer/ClassLoader.php b/core/vendor/composer/ClassLoader.php index ef99245..1db8d9a 100644 --- a/core/vendor/composer/ClassLoader.php +++ b/core/vendor/composer/ClassLoader.php @@ -121,8 +121,8 @@ public function add($prefix, $paths, $prepend = false) /** * Registers a set of classes, replacing any others previously set. * - * @param string $prefix The classes prefix - * @param array|string $paths The location(s) of the classes + * @param string $prefix The classes prefix + * @param array|string $paths The location(s) of the classes */ public function set($prefix, $paths) { diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php index e3c49d0..e5a542a 100644 --- a/core/vendor/composer/autoload_real.php +++ b/core/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php generated by Composer -class ComposerAutoloaderInit75c14c1e390c464828dc7e7f642e6ec3 +class ComposerAutoloaderInit30d2fb8689de6a67010ce67466576f03 { private static $loader; @@ -19,9 +19,9 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit75c14c1e390c464828dc7e7f642e6ec3', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit30d2fb8689de6a67010ce67466576f03', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit75c14c1e390c464828dc7e7f642e6ec3', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit30d2fb8689de6a67010ce67466576f03', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname(dirname($vendorDir)); diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index 888d6a9..e60494c 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -1533,18 +1533,18 @@ }, { "name": "zendframework/zend-stdlib", - "version": "2.2.0rc3", - "version_normalized": "2.2.0.0-RC3", + "version": "dev-master", + "version_normalized": "9999999-dev", "target-dir": "Zend/Stdlib", "source": { "type": "git", "url": "https://github.com/zendframework/Component_ZendStdlib.git", - "reference": "release-2.2.0rc3" + "reference": "release-2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/release-2.2.0rc3", - "reference": "release-2.2.0rc3", + "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/release-2.2.1", + "reference": "release-2.2.1", "shasum": "" }, "require": { @@ -1554,7 +1554,7 @@ "zendframework/zend-eventmanager": "To support aggregate hydrator usage", "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" }, - "time": "2013-05-09 18:00:17", + "time": "2013-06-12 19:46:58", "type": "library", "extra": { "branch-alias": { @@ -1579,18 +1579,18 @@ }, { "name": "zendframework/zend-escaper", - "version": "2.2.0rc3", - "version_normalized": "2.2.0.0-RC3", + "version": "dev-master", + "version_normalized": "9999999-dev", "target-dir": "Zend/Escaper", "source": { "type": "git", "url": "https://github.com/zendframework/Component_ZendEscaper.git", - "reference": "release-2.2.0rc3" + "reference": "release-2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/release-2.2.0rc3", - "reference": "release-2.2.0rc3", + "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/release-2.2.1", + "reference": "release-2.2.1", "shasum": "" }, "require": { @@ -1621,18 +1621,18 @@ }, { "name": "zendframework/zend-feed", - "version": "2.2.0rc3", - "version_normalized": "2.2.0.0-RC3", + "version": "dev-master", + "version_normalized": "9999999-dev", "target-dir": "Zend/Feed", "source": { "type": "git", "url": "https://github.com/zendframework/Component_ZendFeed.git", - "reference": "release-2.2.0rc3" + "reference": "release-2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/release-2.2.0rc3", - "reference": "release-2.2.0rc3", + "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/release-2.2.1", + "reference": "release-2.2.1", "shasum": "" }, "require": { @@ -1645,7 +1645,7 @@ "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations", "zendframework/zend-validator": "Zend\\Validator component" }, - "time": "2013-05-09 21:00:10", + "time": "2013-06-12 19:45:31", "type": "library", "extra": { "branch-alias": { diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/AbstractCallback.php b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/AbstractCallback.php index cc408e5..b3ab190 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/AbstractCallback.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/AbstractCallback.php @@ -84,7 +84,7 @@ public function setOptions($options) /** * Send the response, including all headers. - * If you wish to handle this via Zend_Http, use the getter methods + * If you wish to handle this via Zend\Http, use the getter methods * to retrieve any data needed to be set on your HTTP Response object, or * simply give this object the HTTP Response instance to work with for you! * diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/CallbackInterface.php b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/CallbackInterface.php index 4131eef..9bcc6e2 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/CallbackInterface.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/CallbackInterface.php @@ -23,7 +23,7 @@ public function handle(array $httpData = null, $sendResponseNow = false); /** * Send the response, including all headers. - * If you wish to handle this via Zend_Controller, use the getter methods + * If you wish to handle this via Controller, use the getter methods * to retrieve any data needed to be set on your HTTP Response object, or * simply give this object the HTTP Response instance to work with for you! * @@ -33,8 +33,8 @@ public function sendResponse(); /** * An instance of a class handling Http Responses. This is implemented in - * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with - * (i.e. not inherited from) Zend_Controller_Response_Http. + * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with + * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback. * * @param HttpResponse|\Zend\Http\PhpEnvironment\Response $httpResponse */ @@ -42,8 +42,8 @@ public function setHttpResponse($httpResponse); /** * An instance of a class handling Http Responses. This is implemented in - * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with - * (i.e. not inherited from) Zend_Controller_Response_Http. + * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with + * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback. * * @return HttpResponse|\Zend\Http\PhpEnvironment\Response */ diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/PubSubHubbub.php b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/PubSubHubbub.php index 67dca95..ee00980 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/PubSubHubbub.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/PubSubHubbub.php @@ -43,7 +43,7 @@ class PubSubHubbub /** * Simple utility function which imports any feed URL and * determines the existence of Hub Server endpoints. This works - * best if directly given an instance of Zend_Feed_Reader_Atom|Rss + * best if directly given an instance of Zend\Feed\Reader\Atom|Rss * to leverage off. * * @param \Zend\Feed\Reader\Feed\AbstractFeed|string $source @@ -65,7 +65,7 @@ public static function detectHubs($source) } /** - * Allows the external environment to make Zend_Oauth use a specific + * Allows the external environment to make Oauth use a specific * Client instance. * * @param Http\Client $httpClient diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/Publisher.php b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/Publisher.php index fb2bd8f..ec9c4e1 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/Publisher.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/PubSubHubbub/Publisher.php @@ -34,7 +34,7 @@ class Publisher /** * An array of any errors including keys for 'response', 'hubUrl'. - * The response is the actual Zend_Http_Response object. + * The response is the actual Zend\Http\Response object. * * @var array */ @@ -49,7 +49,7 @@ class Publisher protected $parameters = array(); /** - * Constructor; accepts an array or Zend_Config instance to preset + * Constructor; accepts an array or Zend\Config instance to preset * options for the Publisher without calling all supported setter * methods in turn. * @@ -241,7 +241,7 @@ public function notifyHub($url) * If a Hub notification fails, certain data will be retained in an * an array retrieved using getErrors(), if a failure occurs for any Hubs * the isSuccess() check will return FALSE. This method is designed not - * to needlessly fail with an Exception/Error unless from Zend_Http_Client. + * to needlessly fail with an Exception/Error unless from Zend\Http\Client. * * @return void * @throws Exception\RuntimeException @@ -353,7 +353,7 @@ public function isSuccess() /** * Return an array of errors met from any failures, including keys: - * 'response' => the Zend_Http_Response object from the failure + * 'response' => the Zend\Http\Response object from the failure * 'hubUrl' => the URL of the Hub Server whose notification failed * * @return array diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/AbstractEntry.php b/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/AbstractEntry.php index 4212cf2..797562e 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/AbstractEntry.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/AbstractEntry.php @@ -203,7 +203,7 @@ public function __call($method, $args) } /** - * Load extensions from Zend_Feed_Reader + * Load extensions from Zend\Feed\Reader\Reader * * @return void */ diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/Entry/AbstractEntry.php b/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/Entry/AbstractEntry.php index f6cc948..68ff4f9 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/Entry/AbstractEntry.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/Reader/Entry/AbstractEntry.php @@ -207,7 +207,7 @@ public function __call($method, $args) } /** - * Load extensions from Zend_Feed_Reader + * Load extensions from Zend\Feed\Reader\Reader * * @return void */ diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/AbstractFeed.php b/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/AbstractFeed.php index 465ee9c..389a987 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/AbstractFeed.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/AbstractFeed.php @@ -827,7 +827,7 @@ public function __call($method, $args) } /** - * Load extensions from Zend_Feed_Writer + * Load extensions from Zend\Feed\Writer\Writer * * @throws Exception\RuntimeException * @return void diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Entry.php b/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Entry.php index 219dd43..88a6fea 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Entry.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Entry.php @@ -709,7 +709,7 @@ public function __call($method, $args) } /** - * Creates a new Zend_Feed_Writer_Source data container for use. This is NOT + * Creates a new Zend\Feed\Writer\Source data container for use. This is NOT * added to the current feed automatically, but is necessary to create a * container with some initial values preset based on the current feed data. * @@ -726,7 +726,7 @@ public function createSource() } /** - * Appends a Zend_Feed_Writer_Entry object representing a new entry/item + * Appends a Zend\Feed\Writer\Entry object representing a new entry/item * the feed data container's internal group of entries. * * @param Source $source @@ -750,7 +750,7 @@ public function getSource() } /** - * Load extensions from Zend_Feed_Writer + * Load extensions from Zend\Feed\Writer\Writer * * @return void */ diff --git a/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Renderer/AbstractRenderer.php b/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Renderer/AbstractRenderer.php index c630fdf..f981f49 100644 --- a/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Renderer/AbstractRenderer.php +++ b/core/vendor/zendframework/zend-feed/Zend/Feed/Writer/Renderer/AbstractRenderer.php @@ -209,7 +209,7 @@ public function getRootElement() } /** - * Load extensions from Zend_Feed_Writer + * Load extensions from Zend\Feed\Writer\Writer * * @return void */ diff --git a/core/vendor/zendframework/zend-stdlib/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php b/core/vendor/zendframework/zend-stdlib/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php index 5cbb558..41fda04 100644 --- a/core/vendor/zendframework/zend-stdlib/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php +++ b/core/vendor/zendframework/zend-stdlib/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php @@ -18,7 +18,7 @@ * * @param string $name The name of the strategy to register. * @param StrategyInterface $strategy The strategy to register. - * @return HydratorInterface + * @return StrategyEnabledInterface */ public function addStrategy($name, StrategyInterface $strategy); @@ -42,7 +42,7 @@ public function hasStrategy($name); * Removes the strategy with the given name. * * @param string $name The name of the strategy to remove. - * @return HydratorInterface + * @return StrategyEnabledInterface */ public function removeStrategy($name); }