--- a/autotweet-php/composer.lock Tue Sep 03 18:25:44 2013 +0900
+++ b/autotweet-php/composer.lock Tue Sep 03 18:33:05 2013 +0900
@@ -3,7 +3,11 @@
"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": "e67df720e8a1a2e0e6df41d91d788e48",
+<<<<<<< local
+ "hash": "8f885ddfce0f38da451325a21c07f232",
+=======
+ "hash": "627a18a20db34e43dc89337d8f5728a8",
+>>>>>>> other
"packages": [
{
"name": "doctrine/common",
@@ -378,6 +382,32 @@
"time": "2013-04-26 18:42:52"
},
{
+ "name": "kertz/twitteroauth",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kertz/twitteroauth.git",
+ "reference": "88eb43ba510b120bf7791fe78d42a44332c1e0c0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kertz/twitteroauth/zipball/88eb43ba510b120bf7791fe78d42a44332c1e0c0",
+ "reference": "88eb43ba510b120bf7791fe78d42a44332c1e0c0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "twitteroauth"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "time": "2013-08-29 17:04:43"
+ },
+ {
"name": "kriswallsmith/assetic",
"version": "v1.1.2",
"source": {
@@ -691,16 +721,16 @@
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.0.1",
+ "version": "v5.0.2",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "619aceb969f1e8759edc28fb22f9b64b3bddbc1e"
+ "reference": "f3917ecef35a4e4d98b303eb9fee463bc983f379"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/619aceb969f1e8759edc28fb22f9b64b3bddbc1e",
- "reference": "619aceb969f1e8759edc28fb22f9b64b3bddbc1e",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/f3917ecef35a4e4d98b303eb9fee463bc983f379",
+ "reference": "f3917ecef35a4e4d98b303eb9fee463bc983f379",
"shasum": ""
},
"require": {
@@ -736,7 +766,7 @@
"mail",
"mailer"
],
- "time": "2013-06-17 13:32:32"
+ "time": "2013-08-30 12:35:21"
},
{
"name": "symfony/assetic-bundle",
@@ -803,20 +833,21 @@
},
{
"name": "symfony/icu",
- "version": "v1.0.0",
+ "version": "v1.2.0",
"target-dir": "Symfony/Component/Icu",
"source": {
"type": "git",
"url": "https://github.com/symfony/Icu.git",
- "reference": "cac3fdfb111adbe590155f491594636d45129783"
+ "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Icu/zipball/cac3fdfb111adbe590155f491594636d45129783",
- "reference": "cac3fdfb111adbe590155f491594636d45129783",
+ "url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
+ "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
"shasum": ""
},
"require": {
+ "lib-icu": ">=4.4",
"php": ">=5.3.3",
"symfony/intl": "~2.3"
},
@@ -846,7 +877,7 @@
"icu",
"intl"
],
- "time": "2013-06-03 18:32:07"
+ "time": "2013-06-03 18:32:58"
},
{
"name": "symfony/monolog-bundle",
@@ -1164,6 +1195,691 @@
"templating"
],
"time": "2013-08-03 15:35:31"
+ },
+ {
+ "name": "zendframework/zend-config",
+ "version": "2.2.4",
+ "target-dir": "Zend/Config",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendConfig.git",
+ "reference": "66c41423c7e461f58e33e241cdc6fe6dc4d6cee7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendConfig/zipball/66c41423c7e461f58e33e241cdc6fe6dc4d6cee7",
+ "reference": "66c41423c7e461f58e33e241cdc6fe6dc4d6cee7",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-stdlib": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Config\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+ "keywords": [
+ "config",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:06:49"
+ },
+ {
+ "name": "zendframework/zend-crypt",
+ "version": "2.2.4",
+ "target-dir": "Zend/Crypt",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendCrypt.git",
+ "reference": "97755b496cda7889887adf1d283f8d32c86674b9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendCrypt/zipball/97755b496cda7889887adf1d283f8d32c86674b9",
+ "reference": "97755b496cda7889887adf1d283f8d32c86674b9",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-math": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-stdlib": "self.version"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Crypt\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "crypt",
+ "zf2"
+ ],
+ "time": "2013-06-12 19:48:13"
+ },
+ {
+ "name": "zendframework/zend-escaper",
+ "version": "2.2.4",
+ "target-dir": "Zend/Escaper",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendEscaper.git",
+ "reference": "5db67b32359d86326077209f1fefbbf1183911e8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/5db67b32359d86326077209f1fefbbf1183911e8",
+ "reference": "5db67b32359d86326077209f1fefbbf1183911e8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Escaper\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "escaper",
+ "zf2"
+ ],
+ "time": "2013-05-01 21:53:03"
+ },
+ {
+ "name": "zendframework/zend-feed",
+ "version": "2.2.4",
+ "target-dir": "Zend/Feed",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendFeed.git",
+ "reference": "8fd74c4c166fb46246abc2b70d65c024439a9798"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/8fd74c4c166fb46246abc2b70d65c024439a9798",
+ "reference": "8fd74c4c166fb46246abc2b70d65c024439a9798",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-escaper": "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"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Feed\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides functionality for consuming RSS and Atom feeds",
+ "keywords": [
+ "feed",
+ "zf2"
+ ],
+ "time": "2013-06-28 17:00:15"
+ },
+ {
+ "name": "zendframework/zend-http",
+ "version": "2.2.4",
+ "target-dir": "Zend/Http",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendHttp.git",
+ "reference": "23c58ffd0929dc328c62f1fe12e7a343638c70c8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendHttp/zipball/23c58ffd0929dc328c62f1fe12e7a343638c70c8",
+ "reference": "23c58ffd0929dc328c62f1fe12e7a343638c70c8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-loader": "self.version",
+ "zendframework/zend-stdlib": "self.version",
+ "zendframework/zend-uri": "self.version",
+ "zendframework/zend-validator": "self.version"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Http\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+ "keywords": [
+ "http",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:08:02"
+ },
+ {
+ "name": "zendframework/zend-i18n",
+ "version": "2.2.4",
+ "target-dir": "Zend/I18n",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendI18n.git",
+ "reference": "a8e104e9524486a5b5fd4906379500489a575e79"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendI18n/zipball/a8e104e9524486a5b5fd4906379500489a575e79",
+ "reference": "a8e104e9524486a5b5fd4906379500489a575e79",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "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-resources": "Translation resources",
+ "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"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\I18n\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "i18n",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:07:07"
+ },
+ {
+ "name": "zendframework/zend-json",
+ "version": "2.2.4",
+ "target-dir": "Zend/Json",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendJson.git",
+ "reference": "50d967d5ed65d46a4f49f8a35821c3d8f4ea42f7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendJson/zipball/50d967d5ed65d46a4f49f8a35821c3d8f4ea42f7",
+ "reference": "50d967d5ed65d46a4f49f8a35821c3d8f4ea42f7",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-stdlib": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-server": "Zend\\Server component"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Json\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+ "keywords": [
+ "json",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:07:11"
+ },
+ {
+ "name": "zendframework/zend-loader",
+ "version": "2.2.4",
+ "target-dir": "Zend/Loader",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendLoader.git",
+ "reference": "11a952589d37879d92fee78e70eed731c1073ed3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendLoader/zipball/11a952589d37879d92fee78e70eed731c1073ed3",
+ "reference": "11a952589d37879d92fee78e70eed731c1073ed3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "zendframework/zend-stdlib": "Zend\\Stdlib component"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Loader\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "loader",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:07:14"
+ },
+ {
+ "name": "zendframework/zend-math",
+ "version": "2.2.4",
+ "target-dir": "Zend/Math",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendMath.git",
+ "reference": "8f932ad8b47477a8ef71e0ade1f21c4e683c99e0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendMath/zipball/8f932ad8b47477a8ef71e0ade1f21c4e683c99e0",
+ "reference": "8f932ad8b47477a8ef71e0ade1f21c4e683c99e0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Math\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "math",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:07:20"
+ },
+ {
+ "name": "zendframework/zend-servicemanager",
+ "version": "2.2.4",
+ "target-dir": "Zend/ServiceManager",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendServiceManager.git",
+ "reference": "e05c29f8d7da6e2c26d2d8b334324932a73afa78"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendServiceManager/zipball/e05c29f8d7da6e2c26d2d8b334324932a73afa78",
+ "reference": "e05c29f8d7da6e2c26d2d8b334324932a73afa78",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "zendframework/zend-di": "Zend\\Di component"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\ServiceManager\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "servicemanager",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:07:36"
+ },
+ {
+ "name": "zendframework/zend-stdlib",
+ "version": "2.2.4",
+ "target-dir": "Zend/Stdlib",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendStdlib.git",
+ "reference": "7c87ce4e840957596bf3401fa4ae4fb0355682e2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/7c87ce4e840957596bf3401fa4ae4fb0355682e2",
+ "reference": "7c87ce4e840957596bf3401fa4ae4fb0355682e2",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+ "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Stdlib\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "keywords": [
+ "stdlib",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:08:07"
+ },
+ {
+ "name": "zendframework/zend-uri",
+ "version": "2.2.4",
+ "target-dir": "Zend/Uri",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendUri.git",
+ "reference": "e2a4b038a0939d46e53bfa40cfc9f1791533ae84"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendUri/zipball/e2a4b038a0939d46e53bfa40cfc9f1791533ae84",
+ "reference": "e2a4b038a0939d46e53bfa40cfc9f1791533ae84",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-escaper": "self.version",
+ "zendframework/zend-validator": "self.version"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Uri\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
+ "keywords": [
+ "uri",
+ "zf2"
+ ],
+ "time": "2013-06-12 19:46:02"
+ },
+ {
+ "name": "zendframework/zend-validator",
+ "version": "2.2.4",
+ "target-dir": "Zend/Validator",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/Component_ZendValidator.git",
+ "reference": "3aa2c87ee3d36763b30087b1188f42a6c95f414f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/Component_ZendValidator/zipball/3aa2c87ee3d36763b30087b1188f42a6c95f414f",
+ "reference": "3aa2c87ee3d36763b30087b1188f42a6c95f414f",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-stdlib": "self.version"
+ },
+ "require-dev": {
+ "zendframework/zend-filter": "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-filter": "Zend\\Filter component, required by the Digits validator",
+ "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-resources": "Translations of validator messages",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Validator\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides a set of commonly needed validators",
+ "keywords": [
+ "validator",
+ "zf2"
+ ],
+ "time": "2013-08-21 17:07:51"
+ },
+ {
+ "name": "zendframework/zendoauth",
+ "version": "2.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/ZendOAuth.git",
+ "reference": "0d068773448dd224583aa07b0a16349613bd9b8d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/ZendOAuth/zipball/0d068773448dd224583aa07b0a16349613bd9b8d",
+ "reference": "0d068773448dd224583aa07b0a16349613bd9b8d",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-config": ">=2.0.0",
+ "zendframework/zend-crypt": ">=2.0.0",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zend-i18n": ">=2.0.0",
+ "zendframework/zend-loader": ">=2.0.0",
+ "zendframework/zend-math": ">=2.0.0",
+ "zendframework/zend-stdlib": ">=2.0.0",
+ "zendframework/zend-uri": ">=2.0.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "ZendOAuth": "library/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "homepage": "http://packages.zendframework.com/",
+ "keywords": [
+ "oauth",
+ "zf2"
+ ],
+ "time": "2013-06-10 21:09:59"
+ },
+ {
+ "name": "zendframework/zendservice-twitter",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/ZendService_Twitter.git",
+ "reference": "d101cfa6200655c14eb7dec50a893a17fce4763e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/ZendService_Twitter/zipball/d101cfa6200655c14eb7dec50a893a17fce4763e",
+ "reference": "d101cfa6200655c14eb7dec50a893a17fce4763e",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-feed": ">=2.0.0",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zend-json": ">=2.0.0",
+ "zendframework/zend-stdlib": ">=2.0.0",
+ "zendframework/zend-uri": ">=2.0.0",
+ "zendframework/zendoauth": ">=2.0.0"
+ },
+ "require-dev": {
+ "zendframework/zend-config": ">=2.0.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev",
+ "dev-develop": "2.1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "ZendService\\Twitter\\": "library/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "OOP wrapper for the Twitter web service",
+ "homepage": "http://packages.zendframework.com/",
+ "keywords": [
+ "twitter",
+ "zf2"
+ ],
+ "time": "2013-07-26 13:41:46"
}
],
"packages-dev": [
@@ -1173,9 +1889,13 @@
],
"minimum-stability": "stable",
- "stability-flags": [
-
- ],
+ "stability-flags": {
+<<<<<<< local
+ "kertz/twitteroauth": 20
+=======
+ "zendframework/zendservice-twitter": 20
+>>>>>>> other
+ },
"platform": {
"php": ">=5.3.3"
},