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

Commit bed0062

Browse files
DevKit updates for master branch (#59)
* DevKit updates * DevKit updates
1 parent f3770e5 commit bed0062

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.travis.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,33 @@ cache:
2626
- $HOME/.composer/cache/files
2727

2828
env:
29-
matrix: SYMFONY_VERSION=^3.4@dev
29+
matrix: SYMFONY_VERSION=^4@dev
3030
global:
31-
- SYMFONY_DEPRECATIONS_HELPER=24
31+
- SYMFONY_DEPRECATIONS_HELPER=0
3232
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
3333
- SYMFONY_PHPUNIT_VERSION=5.7
3434
- TEST_INSTALLATION=false
3535

3636
matrix:
3737
include:
3838
- php: 7.1
39-
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
39+
env: DEPS=dev SYMFONY_VERSION=^4@dev
4040
- php: 7.1
41-
env: DEPS=dev SYMFONY_VERSION=3.3.*
41+
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
4242
- php: 7.0
4343
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
4444
- php: 7.1
4545
env: SYMFONY_VERSION=3.1.*
4646
- php: 7.1
4747
env: SYMFONY_VERSION=3.2.*
48+
- php: 7.1
49+
env: SYMFONY_VERSION=3.3.*
4850
- env: TEST_INSTALLATION=true
4951

5052
fast_finish: true
5153
allow_failures:
5254
- php: 7.1
53-
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
55+
env: DEPS=dev SYMFONY_VERSION=^4@dev
5456
- env: TEST_INSTALLATION=true
5557

5658

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@
1313
# file that was distributed with this source code. #
1414
############################################################################
1515

16+
ifeq ("symfony-cmf/resource-rest-bundle", "symfony-cmf/testing")
17+
TESTING_SCRIPTS_DIR=bin
18+
else
1619
TESTING_SCRIPTS_DIR=vendor/symfony-cmf/testing/bin
20+
endif
1721
CONSOLE=${TESTING_SCRIPTS_DIR}/console
1822
VERSION=dev-master
1923
ifdef BRANCH
2024
VERSION=dev-${BRANCH}
2125
endif
2226
PACKAGE=symfony-cmf/resource-rest-bundle
23-
2427
list:
2528
@echo 'test: will run all tests'
2629
@echo 'unit_tests: will run unit tests only'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This Bundle provides a REST API to Puli resources as provided by the CmfResource
2121
## Requirements
2222

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

2727
## Documentation

0 commit comments

Comments
 (0)