Skip to content

Commit 3c8fd53

Browse files
author
Serhii Polishchuk
committed
Revert to 3cc0696
1 parent 098c6a3 commit 3c8fd53

File tree

3 files changed

+775
-1820
lines changed

3 files changed

+775
-1820
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: php
22
php:
3+
- 5.4
34
- 5.5
45
- 5.6
56
- hhvm
6-
- 7
7+
# - 7
78

89
env:
910
- SYMFONY_VERSION=2.6.*

composer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"psr-0": { "": "src/", "SymfonyStandard": "app/" }
88
},
99
"require": {
10-
"php": ">=5.5.0",
11-
"symfony/symfony": "~2.8",
10+
"php": ">=5.4.0",
11+
"symfony/symfony": "2.6.9",
1212
"symfony/assetic-bundle": "~2.3",
1313
"symfony/swiftmailer-bundle": "~2.3",
1414
"symfony/monolog-bundle": "~2.4",
@@ -17,6 +17,7 @@
1717
"doctrine/common": "2.5.1",
1818
"doctrine/orm": "2.5.1",
1919
"doctrine/doctrine-bundle": "1.5.2",
20+
"doctrine/migrations": "1.0.*@dev",
2021
"doctrine/doctrine-migrations-bundle": " 2.1.*@dev",
2122
"doctrine/annotations": "1.2.7",
2223
"doctrine/cache": "1.4.2",
@@ -28,6 +29,7 @@
2829
"knplabs/knp-paginator-bundle": "2.4.*@dev",
2930
"guzzlehttp/guzzle": "~5.0",
3031
"twig/extensions": "~1.0",
32+
"twig/twig": "1.22.1",
3133
"nelmio/api-doc-bundle": "dev-master",
3234
"sonata-project/admin-bundle": "~2.3",
3335
"sonata-project/doctrine-orm-admin-bundle": "~2.3",
@@ -74,6 +76,9 @@
7476
"symfony-assets-install": "relative",
7577
"incenteev-parameters": {
7678
"file": "app/config/parameters.yml"
79+
},
80+
"branch-alias": {
81+
"dev-master": "2.6-dev"
7782
}
7883
}
7984
}

0 commit comments

Comments
 (0)