Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 2c77497

Browse files
Adjustments to make travis files almost equal, test it with different symfony versions
* DevKit updates * fix in versioning * use almost same travis script * readd composer update * DevKit updates * add min stability
1 parent 5d3bb3d commit 2c77497

File tree

4 files changed

+40
-27
lines changed

4 files changed

+40
-27
lines changed

.travis.yml

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: php
22

33
php:
4-
- 5.6
5-
- 7.0
64
- 7.1
75

86
sudo: required
@@ -14,37 +12,53 @@ cache:
1412
# - node_modules
1513

1614
env:
17-
- LANG=php
18-
- NODE_RELEASE=6.x
15+
env:
16+
matrix: SYMFONY_VERSION=^3.4@dev
17+
global:
18+
- SYMFONY_DEPRECATIONS_HELPER=0
19+
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
20+
- KERNEL_CLASS=Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel
21+
- SYMFONY_PHPUNIT_VERSION=5.7
22+
- TEST_INSTALLATION=false
23+
- LANG=php
24+
- NODE_RELEASE=6.x
1925

2026
matrix:
2127
include:
22-
- php: 5.6
28+
- php: 7.1
2329
dist: trusty
2430
env:
2531
- LANG=js
2632
- NODE_RELEASE=6.x
27-
- php: hhvm
28-
dist: trusty
29-
exclude:
30-
- php: 5.6
31-
env: NODE_RELEASE=6.x
32-
- php: 7.0
33-
env: NODE_RELEASE=6.x
3433
- php: 7.1
35-
env: NODE_RELEASE=6.x
34+
env: DEPS=dev SYMFONY_VERSION=^4.0@dev
35+
- php: 7.1
36+
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
37+
- php: 7.1
38+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
39+
- php: 7.1
40+
env: SYMFONY_VERSION=3.3.*
41+
- env: TEST_INSTALLATION=true
3642
fast_finish: true
43+
allow_failures:
44+
- php: 7.1
45+
env: DEPS=dev SYMFONY_VERSION=^4.0@dev
46+
- env: TEST_INSTALLATION=true
3747

3848
before_install:
49+
- if [ "$LANG" = "js" ]; then npm run travis:install; fi
3950
- if [ "$LANG" = "php" ]; then phpenv config-rm xdebug.ini || true; fi
51+
- phpenv config-rm xdebug.ini || true
52+
- composer self-update
53+
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
54+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
55+
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
4056

41-
install:
42-
- if [ "$LANG" = "js" ]; then npm run travis:install; fi
43-
- if [ "$LANG" = "php" ]; then composer update --prefer-dist; fi
57+
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
4458

4559
script:
4660
- if [ "$LANG" = "js" ]; then npm test; fi
47-
- if [ "$LANG" = "php" ]; then vendor/bin/simple-phpunit; fi
61+
- if [ "$LANG" = "php" ]; then make test; fi
4862

4963
notifications:
5064
irc: "irc.freenode.org#symfony-cmf"

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
# file that was distributed with this source code. #
1414
############################################################################
1515

16-
ifeq ("symfony-cmf/tree-browser-bundle", "symfony-cmf/testing")
17-
TESTING_SCRIPTS_DIR=bin
18-
else
1916
TESTING_SCRIPTS_DIR=vendor/symfony-cmf/testing/bin
20-
endif
2117
CONSOLE=${TESTING_SCRIPTS_DIR}/console
2218
VERSION=dev-master
2319
ifdef BRANCH
@@ -29,8 +25,9 @@ list:
2925
@echo 'unit_tests: will run unit tests only'
3026

3127

32-
28+
@echo 'test_installation: will run installation test'
3329
include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
30+
include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk
3431

3532
.PHONY: test
3633
test: unit_tests

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ The TreeBrowserBundle provides tree navigation for the Content Repository.
2020

2121
## Requirements
2222

23-
* PHP 5.6 / 7.0 / 7.1
24-
* Symfony 2.8 / 3.1 / 3.2 / 3.3 / ^3.4@dev
23+
* PHP 7.1
24+
* Symfony 2.8 / ^3.4@dev
2525
* See also the `require` section of [composer.json](composer.json)
2626

2727
## Documentation

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^5.6|^7.0",
15+
"php": "^7.1",
1616
"symfony-cmf/resource-rest-bundle": "1.0.*"
1717
},
1818
"require-dev": {
19-
"symfony/form": "^2.8|^3.0",
19+
"symfony/form": "^2.8|^3.3",
2020
"symfony-cmf/testing": "^2.1@dev",
2121
"symfony/phpunit-bridge": "^3.3.10"
2222
},
@@ -34,5 +34,7 @@
3434
"branch-alias": {
3535
"dev-master": "2.1-dev"
3636
}
37-
}
37+
},
38+
"minimum-stability":"dev",
39+
"prefer-stable": true
3840
}

0 commit comments

Comments
 (0)