Skip to content

Commit e6c1ddd

Browse files
committed
Merge remote-tracking branch 'remotes/origin/master' into release
2 parents 0f06fef + 8e75d7b commit e6c1ddd

File tree

181 files changed

+8710
-1303
lines changed

Some content is hidden

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

181 files changed

+8710
-1303
lines changed

Diff for: .travis.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
language: php
2+
3+
php:
4+
- 5.3
5+
- 5.4
6+
- 5.5
7+
8+
env:
9+
- SYMFONY_VERSION=2.3.*
10+
11+
before_script:
12+
- composer self-update
13+
- phpenv config-add travis.php.ini
14+
- composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
15+
16+
script: phpunit --coverage-text

Diff for: README.md

+2-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ chapter.
1010
Requirements
1111
------------
1212

13-
OroCRM requires Symfony 2, Doctrine 2 and PHP 5.3.3 or above.
13+
OroCRM requires Symfony 2, Doctrine 2 and PHP 5.3.8 or above.
1414

1515
Installation
1616
------------
@@ -34,17 +34,9 @@ phpunit
3434

3535
Use as dependency in composer
3636
-----------------------------
37-
Until it's a private repository and it's not published on packagist :
3837

3938
```yaml
4039
"require": {
4140
"oro/crm": "dev-master",
42-
},
43-
"repositories": [
44-
{
45-
"type": "vcs",
46-
"url": "https://github.com/orocrm/crm.git",
47-
"branch": "master"
48-
}
49-
],
41+
}
5042
```

Diff for: composer.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
{
22
"name": "oro/crm",
33
"description": "OroCRM",
4-
"homepage": "https://github.com/laboro/crm.git",
4+
"homepage": "https://github.com/orocrm/crm.git",
55
"license": "The Open Software License version 3.0",
66
"autoload": {
7-
"psr-0": { "OroCRM\\Bundle": "src/" }
7+
"psr-0": {
8+
"OroCRM\\Bundle": "src/"
9+
}
810
},
911
"require": {
10-
"php": ">=5.3.3",
12+
"php": ">=5.3.8",
1113
"oro/platform": "dev-release"
1214
},
1315
"repositories": [

Diff for: phpunit.xml.dist

+5-10
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515

1616
<testsuites>
1717
<testsuite name="Project Unit Tests">
18-
<directory suffix="Test.php">src/OroCRM/Bundle/AccountBundle/Tests/Unit</directory>
19-
<directory suffix="Test.php">src/OroCRM/Bundle/ContactBundle/Tests/Unit</directory>
20-
<directory suffix="Test.php">src/OroCRM/Bundle/DashboardBundle/Tests/Unit</directory>
18+
<directory suffix="Test.php">src/OroCRM/Bundle/*Bundle/Tests/Unit</directory>
2119
</testsuite>
2220
</testsuites>
2321

@@ -31,13 +29,10 @@
3129
<directory>src</directory>
3230
<exclude>
3331
<directory>vendor</directory>
34-
<directory>src/OroCRM/Bundle/DataFixtures</directory>
35-
<directory>src/OroCRM/Bundle/DataFixtures</directory>
36-
<directory>src/OroCRM/Bundle/Resources</directory>
37-
<directory>src/OroCRM/Bundle/Tests</directory>
38-
<directory>src/OroCRM/Bundle/Resources</directory>
39-
<directory>src/OroCRM/Bundle/Tests</directory>
40-
<directory>src/OroCRM/Bundle/vendor</directory>
32+
<directory>src/OroCRM/Bundle/*Bundle/DataFixtures</directory>
33+
<directory>src/OroCRM/Bundle/*Bundle/Resources</directory>
34+
<directory>src/OroCRM/Bundle/*Bundle/Tests</directory>
35+
<directory>src/OroCRM/Bundle/*Bundle/vendor</directory>
4136
</exclude>
4237
</whitelist>
4338
</filter>

0 commit comments

Comments
 (0)