Skip to content

Commit

Permalink
Merge pull request ezsystems#74 from ezsystems/remove_composer_lock
Browse files Browse the repository at this point in the history
Fix EZP-21482: Remove composer.lock to make sure correct symfony/icu is picked on install
  • Loading branch information
andrerom committed Sep 2, 2013
2 parents 08f0804 + 10062b8 commit ee1c1b1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3,863 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
/web/var
/web/.htaccess
composer.phar
composer.lock
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"sensio/distribution-bundle": "2.3.*",
"sensio/generator-bundle": "2.3.*",
"incenteev/composer-parameter-handler": "~2.0",
"symfony-cmf/routing": "1.1.*@beta",
"symfony-cmf/routing": "1.1.*@rc",
"tedivm/stash-bundle": "0.2.*",
"ezsystems/ezpublish-kernel": "dev-master",
"ezsystems/ezpublish-kernel": "5.2.*@dev",
"ezsystems/demobundle": "@dev",
"egulias/listeners-debug-command-bundle": "1.4.*",
"egulias/listeners-debug-command-bundle": "1.6.*",
"zetacomponents/archive": "dev-fixUnpackPHP55",
"zetacomponents/authentication": "@dev",
"zetacomponents/authentication-database-tiein": "@dev",
Expand All @@ -53,14 +53,13 @@
"zetacomponents/system-information": "@dev"
},
"require-dev": {
"behat/behat": "2.4.*",
"behat/behat": "2.5.*",
"behat/symfony2-extension": "*",
"behat/sahi-client": "dev-master as 1.1.1",
"behat/mink-extension": "*",
"behat/mink-goutte-driver": "*",
"behat/mink-selenium-driver": "*",
"behat/mink-sahi-driver": "*",
"symfony/icu": "~1.0",
"phpunit/phpunit": "3.7.*"
},
"scripts": {
Expand Down
Loading

0 comments on commit ee1c1b1

Please sign in to comment.