Skip to content

Commit 80fe6e1

Browse files
committed
Merge pull request #126 from MageTest/develop
Stable 3.0 release
2 parents ed77f86 + ebf75d9 commit 80fe6e1

File tree

53 files changed

+1145
-2246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1145
-2246
lines changed

.scrutinizer.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ imports:
22
- php
33

44
filter:
5-
excluded_paths:
5+
excluded-paths:
66
- example/*
77
- fixtures/*
88
- vendor/*
@@ -13,13 +13,13 @@ tools:
1313
config:
1414
standard: "PSR2"
1515
filter:
16-
excluded-paths: [ spec/*, features/* ]
16+
excluded-paths: [ spec/*, features/*, src/Mage/* ]
1717
php_sim:
1818
filter:
19-
excluded-paths: [ spec/*, features/* ]
19+
excluded-paths: [ spec/*, features/*, src/Mage/* ]
2020
php_changetracking: true
2121
php_mess_detector: true
2222
php_pdepend: true
2323
php_analyzer:
2424
filter:
25-
excluded-paths: [ spec/*, features/* ]
25+
excluded-paths: [ spec/*, features/*, src/Mage/* ]

README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
## MageSpec
22

3-
[![Build Status](https://travis-ci.org/MageTest/MageSpec.png?branch=develop)](https://travis-ci.org/MageTest/MageSpec)
3+
[![Build Status](https://travis-ci.org/MageTest/MageSpec.png?branch=master)](https://travis-ci.org/MageTest/MageSpec)
4+
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MageTest/MageSpec/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/MageTest/MageSpec/?branch=master)
5+
[![Latest Stable Version](https://poser.pugx.org/magetest/magento-phpspec-extension/v/stable.png)](https://packagist.org/packages/magetest/magento-phpspec-extension)
6+
[![Packagist Downloads](https://poser.pugx.org/magetest/magento-phpspec-extension/downloads.png)](https://packagist.org/packages/magetest/magento-phpspec-extension)
7+
[![License](https://poser.pugx.org/magetest/magento-phpspec-extension/license)](https://packagist.org/packages/magetest/magento-phpspec-extension)
48

59
## Installation
610

@@ -30,8 +34,7 @@ First, add MageSpec to the list of dependencies inside your `composer.json` and
3034
"public/lib"
3135
]
3236
}
33-
},
34-
"minimum-stability": "dev"
37+
}
3538
}
3639
```
3740

composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"type": "library",
66
"license": "MIT",
77
"require": {
8-
"phpspec/phpspec": "~2.1.1",
9-
"symfony/dependency-injection": "*",
10-
"symfony/config": "*",
11-
"shanethehat/pretty-xml": "~1.0.1"
8+
"phpspec/phpspec": "~2.3.0",
9+
"symfony/dependency-injection": "~2.1",
10+
"symfony/config": "~2.1",
11+
"shanethehat/pretty-xml": "~1.0.2"
1212
},
1313
"require-dev": {
1414
"magetest/magento": "~1.8.1.0",
15-
"behat/behat": "3.0",
16-
"bossa/phpspec2-expect": "*"
15+
"behat/behat": "~3.0",
16+
"bossa/phpspec2-expect": "~1.0"
1717
},
1818
"config": {
1919
"bin-dir": "bin"

0 commit comments

Comments
 (0)