Skip to content

Commit 5053721

Browse files
author
David Alger
committed
Merge branch 'master' into issue-76
2 parents 9c52208 + 0c93d05 commit 5053721

File tree

17 files changed

+419
-53
lines changed

17 files changed

+419
-53
lines changed

‎.travis.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
language: php
22
php:
3-
- "5.5"
4-
- "5.4"
5-
- "5.3"
3+
- 5.6
4+
- 5.5
5+
- 5.4
6+
- 5.3
7+
- hhvm
8+
9+
matrix:
10+
allow_failures:
11+
- php: 5.6
12+
- php: hhvm
613

714
before_script:
815
- curl -sS https://getcomposer.org/installer | php
916
- chmod +x ./composer.phar
1017
- ./composer.phar --version
1118
- ./composer.phar install --dev
19+
20+
script:
21+
- ./vendor/bin/phpunit
1222

1323
notifications:
1424
email:

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ If you want to have the deployed files automatically added to your .gitignore fi
290290
...
291291
"extra":{
292292
"magento-root-dir": "htdocs/",
293-
auto-append-gitignore": true
293+
"auto-append-gitignore": true
294294
}
295295
...
296296
}

‎composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"magento-hackathon/magento-composer-installer",
33
"description":"Composer installer for Magento modules",
44
"keywords":[ "composer-installer", "magento"],
5-
"minimum-stability":"dev",
5+
"minimum-stability":"stable",
66
"type":"composer-installer",
77
"license":"OSL-3.0",
88
"homepage":"https://github.com/magento-hackathon/magento-composer-installer",
@@ -36,7 +36,8 @@
3636
},
3737
"require-dev":{
3838
"phpunit/phpunit":"*",
39-
"composer/composer":"*",
39+
"composer/composer":"*@dev",
40+
"symfony/process":"*",
4041
"mikey179/vfsStream":"*"
4142
},
4243
"suggest":{
@@ -47,6 +48,12 @@
4748
"MagentoHackathon\\Composer\\Magento":"src/"
4849
}
4950
},
51+
"archive": {
52+
"exclude": [
53+
"/tests/FullStackTest"
54+
]
55+
},
56+
"test_version":"999.0.0",
5057
"extra":{
5158
"composer-command-registry": [ "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand" ],
5259
"class":"MagentoHackathon\\Composer\\Magento\\Installer"

‎tests/FullStackTest/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ vendor
33
composer.lock
44
magento-modules/composer.json
55

6+
artifact/*
7+
!artifact/empty

‎tests/FullStackTest/artifact/empty

Whitespace-only changes.

‎tests/FullStackTest/magento-modules/composer_1.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@
22
"require": {
33
"fbrnc/aoe_templatehints": "*",
44
"fbrnc/aoe_profiler": "*",
5-
"magento-hackathon/magento-composer-installer": "dev-master@dev",
5+
"magento-hackathon/magento-composer-installer": "*",
66
"firegento/psr0autoloader": "dev-master",
7+
"connect20/aw_blog": "*",
8+
"connect20/aw_onpulse": "*",
9+
"connect20/aw_aheadmetrics": "*",
10+
"connect20/aw_fps": "*",
11+
"magento-hackathon/magento-composer-installer-test-issue-87": "1.*",
712
"firegento/magesetup": "*"
813
},
914
"require-dev": {
1015
"magento-hackathon/composer-command-integrator": "*",
1116
"composer/composer": "dev-master"
1217
},
1318
"repositories": [
14-
{
15-
"type": "vcs",
16-
"url": "https://github.com/magento-hackathon/magento-composer-installer"
17-
},
1819
{
1920
"type": "composer",
2021
"url": "http://packages.firegento.com"
21-
}
22+
},
23+
{
24+
"type": "artifact",
25+
"url": "../artifact/"
26+
}
2227
],
2328
"extra":{
2429
"magento-deploystrategy": "symlink",

‎tests/FullStackTest/magento-modules/composer_1_copy.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"require": {
3+
"fbrnc/aoe_templatehints": "*",
4+
"fbrnc/aoe_profiler": "*",
5+
"magento-hackathon/magento-composer-installer": "*",
6+
"firegento/psr0autoloader": "dev-master",
7+
"connect20/aw_blog": "*",
8+
"connect20/aw_onpulse": "*",
9+
"connect20/aw_aheadmetrics": "*",
10+
"connect20/aw_fps": "*",
11+
"magento-hackathon/magento-composer-installer-test-issue-87": "1.*",
12+
"firegento/magesetup": "*"
13+
},
14+
"require-dev": {
15+
"magento-hackathon/composer-command-integrator": "*",
16+
"composer/composer": "dev-master"
17+
},
18+
"repositories": [
19+
{
20+
"type": "composer",
21+
"url": "http://packages.firegento.com"
22+
},
23+
{
24+
"type": "artifact",
25+
"url": "../artifact/"
26+
}
27+
],
28+
"extra":{
29+
"magento-deploystrategy": "copy",
30+
"auto-append-gitignore": true,
31+
"magento-root-dir": "../htdocs/"
32+
}
33+
}

‎tests/FullStackTest/magento-modules/composer_1_copy_force.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"require": {
3+
"fbrnc/aoe_templatehints": "*",
4+
"fbrnc/aoe_profiler": "*",
5+
"magento-hackathon/magento-composer-installer": "*",
6+
"firegento/psr0autoloader": "dev-master",
7+
"connect20/aw_blog": "*",
8+
"connect20/aw_onpulse": "*",
9+
"connect20/aw_aheadmetrics": "*",
10+
"connect20/aw_fps": "*",
11+
"magento-hackathon/magento-composer-installer-test-issue-87": "1.*",
12+
"firegento/magesetup": "*"
13+
},
14+
"require-dev": {
15+
"magento-hackathon/composer-command-integrator": "*",
16+
"composer/composer": "dev-master"
17+
},
18+
"repositories": [
19+
{
20+
"type": "composer",
21+
"url": "http://packages.firegento.com"
22+
},
23+
{
24+
"type": "artifact",
25+
"url": "../artifact/"
26+
}
27+
],
28+
"extra":{
29+
"magento-deploystrategy": "copy",
30+
"magento-force": true,
31+
"auto-append-gitignore": true,
32+
"magento-root-dir": "../htdocs/"
33+
}
34+
}

‎tests/FullStackTest/magento-modules/composer_2.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"require": {
33
},
44
"repositories": [
5-
{
6-
"type": "vcs",
7-
"url": "https://github.com/magento-hackathon/magento-composer-installer"
8-
},
95
{
106
"type": "composer",
117
"url": "http://packages.firegento.com"
12-
}
8+
},
9+
{
10+
"type": "artifact",
11+
"url": "../artifact/"
12+
}
1313
],
1414
"extra":{
1515
"magento-deploystrategy": "symlink",

‎tests/FullStackTest/magento-modules/composer_2_copy.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"require": {
3+
},
4+
"repositories": [
5+
{
6+
"type": "composer",
7+
"url": "http://packages.firegento.com"
8+
},
9+
{
10+
"type": "artifact",
11+
"url": "../artifact/"
12+
}
13+
],
14+
"extra":{
15+
"magento-deploystrategy": "copy",
16+
"auto-append-gitignore": true,
17+
"magento-root-dir": "../htdocs/"
18+
}
19+
}

‎tests/FullStackTest/magento-modules/composer_2_copy_force.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"require": {
3+
},
4+
"repositories": [
5+
{
6+
"type": "composer",
7+
"url": "http://packages.firegento.com"
8+
},
9+
{
10+
"type": "artifact",
11+
"url": "../artifact/"
12+
}
13+
],
14+
"extra":{
15+
"magento-deploystrategy": "copy",
16+
"magento-force": true,
17+
"auto-append-gitignore": true,
18+
"magento-root-dir": "../htdocs/"
19+
}
20+
}

‎tests/FullStackTest/magento/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"require": {
3-
"magento-hackathon/magento-composer-installer": "dev-master@dev",
3+
"magento-hackathon/magento-composer-installer": "*",
44
"connect20/mage_all_latest": "*"
55
},
66
"repositories": [
7-
{
8-
"type": "vcs",
9-
"url": "https://github.com/magento-hackathon/magento-composer-installer"
10-
},
117
{
128
"type": "composer",
139
"url": "http://packages.firegento.com"
14-
}
10+
},
11+
{
12+
"type": "artifact",
13+
"url": "../artifact/"
14+
}
1515
],
1616
"extra":{
1717
"magento-deploystrategy": "copy",

0 commit comments

Comments
 (0)