diff --git a/composer.json b/composer.json index 0d828619be..1c69cbaee1 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "php" : ">=5.3.3", "alchemy/oauth2php" : "1.0.0", "alchemy/phlickr" : "0.2.7", - "dailymotion/sdk" : "dev-master@dev", + "dailymotion/sdk" : "~1.5", "data-uri/data-uri" : "~0.1.0", "doctrine/orm" : "~2.3.0", "facebook/php-sdk" : "~3.0", diff --git a/composer.lock b/composer.lock index cd8f896de6..4feeb7dc0a 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": "267afc76ec76be5546e4be973f459707", + "hash": "9d64a5bd6201a8a30e4181b7ece5f91b", "packages": [ { "name": "alchemy/binary-driver", @@ -238,16 +238,16 @@ }, { "name": "dailymotion/sdk", - "version": "dev-master", + "version": "1.51", "source": { "type": "git", "url": "https://github.com/dailymotion/dailymotion-sdk-php.git", - "reference": "b0f29a36e1fb52ac0da024af8e8c3594603f6f6e" + "reference": "1.51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/b0f29a36e1fb52ac0da024af8e8c3594603f6f6e", - "reference": "b0f29a36e1fb52ac0da024af8e8c3594603f6f6e", + "url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/1.51", + "reference": "1.51", "shasum": "" }, "type": "library", @@ -267,7 +267,7 @@ "dailymotion", "sdk" ], - "time": "2013-04-29 16:18:34" + "time": "2013-07-08 13:56:27" }, { "name": "data-uri/data-uri", @@ -3439,16 +3439,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "1.2.11", + "version": "1.2.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "1.2.11" + "reference": "1.2.12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.11", - "reference": "1.2.11", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.12", + "reference": "1.2.12", "shasum": "" }, "require": { @@ -3458,13 +3458,18 @@ "phpunit/php-token-stream": ">=1.1.3@stable" }, "require-dev": { - "phpunit/phpunit": "3.7.*" + "phpunit/phpunit": "3.7.*@dev" }, "suggest": { "ext-dom": "*", "ext-xdebug": ">=2.0.5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, "autoload": { "classmap": [ "PHP/" @@ -3491,7 +3496,7 @@ "testing", "xunit" ], - "time": "2013-05-23 18:23:24" + "time": "2013-07-06 06:26:16" }, { "name": "phpunit/php-file-iterator", @@ -3673,16 +3678,16 @@ }, { "name": "phpunit/phpunit", - "version": "3.7.21", + "version": "3.7.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.21" + "reference": "3.7.22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.21", - "reference": "3.7.21", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.22", + "reference": "3.7.22", "shasum": "" }, "require": { @@ -3691,12 +3696,12 @@ "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", + "phpunit/php-code-coverage": "~1.2.1", "phpunit/php-file-iterator": ">=1.3.1", "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": ">=1.0.2,<1.1.0", - "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", - "symfony/yaml": ">=2.0,<3.0" + "phpunit/php-timer": "~1.0.2", + "phpunit/phpunit-mock-objects": "~1.2.0", + "symfony/yaml": "~2.0" }, "require-dev": { "pear-pear/pear": "1.9.4" @@ -3743,7 +3748,7 @@ "testing", "xunit" ], - "time": "2013-05-23 18:54:29" + "time": "2013-07-06 06:29:15" }, { "name": "phpunit/phpunit-mock-objects", @@ -3800,7 +3805,6 @@ ], "minimum-stability": "stable", "stability-flags": { - "dailymotion/sdk": 20, "neutron/imagine": 20, "mrclay/minify": 20, "doctrine/data-fixtures": 20,