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

Commit fa3cf83

Browse files
committed
DevKit updates
1 parent 5557d25 commit fa3cf83

File tree

5 files changed

+49
-46
lines changed

5 files changed

+49
-46
lines changed

.travis.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,35 @@ cache:
2626
- $HOME/.composer/cache/files
2727

2828
env:
29-
matrix: SYMFONY_VERSION=4.0.*
29+
matrix: SYMFONY_VERSION=4.2.*
3030
global:
3131
- SYMFONY_DEPRECATIONS_HELPER="0"
3232
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
3333
- KERNEL_CLASS=Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Fixtures\App\Kernel
34-
- SYMFONY_PHPUNIT_VERSION=5.7
35-
- TEST_INSTALLATION=false
36-
- COMPOSER_MEMORY_LIMIT=-1
34+
- SYMFONY_PHPUNIT_VERSION=5.7.26
3735

3836
matrix:
3937
include:
40-
- php: 7.1
41-
env: STABILITY=dev SYMFONY_VERSION=4.0.*
42-
- php: 7.1
43-
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
44-
- php: 7.1
45-
env: STABILITY=dev SYMFONY_VERSION=3.3.*
46-
- php: 7.1
47-
env: STABILITY=dev SYMFONY_VERSION=3.4.*
48-
- env: TEST_INSTALLATION=true
38+
- php: "7.1"
39+
env: STABILITY="dev" SYMFONY_VERSION="4.2.*"
40+
- php: "7.1"
41+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION="3.4.*" SYMFONY_DEPRECATIONS_HELPER="0"
42+
- php: "7.1"
43+
env: STABILITY="dev" SYMFONY_VERSION="4.0.*"
44+
- php: "7.1"
45+
env: STABILITY="dev" SYMFONY_VERSION="4.1.*"
4946
fast_finish: true
5047
allow_failures:
51-
- env: TEST_INSTALLATION=true
5248

5349
before_install:
5450
- phpenv config-rm xdebug.ini || true
5551
- composer self-update
52+
- composer validate --no-check-all --ansi
5653
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
5754
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
5855
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
5956

6057
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
61-
6258
script:
6359
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
6460

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ list:
2626
@echo 'unit_tests: will run unit tests only'
2727
@echo 'functional_tests_phpcr: will run functional tests with PHPCR'
2828

29-
@echo 'test_installation: will run installation test'
29+
3030
include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
3131
include ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk
32-
include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk
3332

3433
.PHONY: test
3534
test: unit_tests functional_tests_phpcr

README.md

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,37 @@
88
[![Monthly Downloads](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
99
[![Daily Downloads](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
1010

11-
Branch | Travis | Coveralls |
12-
------ | ------ | --------- |
13-
master | [![Build Status][travis_unstable_badge]][travis_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
11+
Branch | Travis | Coveralls | Scrutinizer |
12+
------ | ------ | --------- | ----------- |
13+
1.0 | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] | [![Scrutinizer Status][scrutinizer_stable_badge]][scrutinizer_stable_link] |
14+
1.1-dev | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] | [![Scrutinizer Status][scrutinizer_unstable_badge]][scrutinizer_unstable_link] |
1415

15-
This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
16+
17+
This package is part of the [Symfony Content Management Framework (CMF)](https://cmf.symfony.com/) and licensed
1618
under the [MIT License](LICENSE).
1719

1820

1921

2022
## Requirements
2123

2224
* PHP 7.1
23-
* Symfony 2.8 / 3.3 / 3.4 / 4.0
25+
* Symfony 3.4 / 4.0 / 4.1 / 4.2
2426
* See also the `require` section of [composer.json](composer.json)
2527

2628
## Documentation
2729

2830
For the install guide and reference, see:
2931

30-
* [symfony-cmf/sonata-phpcr-admin-integration-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/sonata-phpcr-admin-integration-bundle/index.html)
32+
* [symfony-cmf/sonata-phpcr-admin-integration-bundle Documentation](https://symfony.com/doc/master/cmf/bundles/sonata-phpcr-admin-integration-bundle/index.html)
3133

3234
See also:
3335

34-
* [All Symfony CMF documentation](http://symfony.com/doc/master/cmf/index.html) - complete Symfony CMF reference
35-
* [Symfony CMF Website](http://cmf.symfony.com/) - introduction, live demo, support and community links
36+
* [All Symfony CMF documentation](https://symfony.com/doc/master/cmf/index.html) - complete Symfony CMF reference
37+
* [Symfony CMF Website](https://cmf.symfony.com/) - introduction, live demo, support and community links
3638

3739
## Support
3840

39-
For general support and questions, please use [StackOverflow](http://stackoverflow.com/questions/tagged/symfony-cmf).
41+
For general support and questions, please use [StackOverflow](https://stackoverflow.com/questions/tagged/symfony-cmf).
4042

4143
## Contributing
4244

@@ -45,7 +47,7 @@ Pull requests are welcome. Please see our
4547
guide.
4648

4749
Unit and/or functional tests exist for this package. See the
48-
[Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
50+
[Testing documentation](https://symfony.com/doc/master/cmf/components/testing.html)
4951
for a guide to running the tests.
5052

5153
Thanks to
@@ -55,14 +57,17 @@ Thanks to
5557

5658
This package is available under the [MIT license](src/Resources/meta/LICENSE).
5759

58-
[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=master
59-
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=master
60-
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=master
61-
[travis_link]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle
62-
63-
[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=master
64-
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=master
65-
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=master
66-
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=master
67-
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=master
68-
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=master
60+
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=1.0
61+
[travis_stable_link]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle
62+
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=1.1-dev
63+
[travis_unstable_link]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle
64+
65+
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=1.0
66+
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=1.0
67+
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=1.1-dev
68+
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=1.1-dev
69+
70+
[scrutinizer_stable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/badges/quality-score.png?b=1.0
71+
[scrutinizer_stable_link]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/?branch=1.0
72+
[scrutinizer_unstable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/badges/quality-score.png?b=1.1-dev
73+
[scrutinizer_unstable_link]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/?branch=1.1-dev

composer.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@
1616
}
1717
],
1818
"repositories": [
19-
{"type": "vcs", "url": "https://github.com/ElectricMaxxx/SonataDoctrinePhpcrAdminBundle.git"}
19+
{
20+
"type": "vcs",
21+
"url": "https://github.com/ElectricMaxxx/SonataDoctrinePhpcrAdminBundle.git"
22+
}
2023
],
2124
"require": {
2225
"php": "^7.1",
23-
"symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
26+
"symfony/framework-bundle": "^3.4 || ^4.0",
2427
"sonata-project/doctrine-phpcr-admin-bundle": "dev-allow_Symfony_4 as 2.1",
2528
"sonata-project/admin-bundle": "^3.6.0",
2629
"symfony-cmf/tree-browser-bundle": "^2.0"
@@ -36,14 +39,14 @@
3639
"doctrine/orm": "^2.4",
3740
"doctrine/phpcr-odm": "^1.4|^2.0",
3841
"doctrine/doctrine-bundle": "^1.3",
39-
"symfony/phpunit-bridge": "^3.3 || ^4.0",
42+
"symfony/phpunit-bridge": "^3.4 || ^4.0",
4043
"matthiasnoback/symfony-dependency-injection-test": "^1.1",
4144
"matthiasnoback/symfony-config-test": "^2.1",
4245
"burgov/key-value-form-bundle": "^1.0",
43-
"symfony/asset": "^2.8 || ^3.3 || ^4.0",
44-
"symfony/browser-kit": "^2.8 || ^3.3 || ^4.0",
45-
"symfony/css-selector": "^2.8 || ^3.3 || ^4.0",
46-
"friendsofsymfony/ckeditor-bundle": "^1.0"
46+
"symfony/asset": "^3.4 || ^4.0",
47+
"symfony/browser-kit": "^3.4 || ^4.0",
48+
"symfony/css-selector": "^3.4 || ^4.0",
49+
"friendsofsymfony/ckeditor-bundle": "^3.4 || ^4.0"
4750
},
4851
"suggest": {
4952
"symfony-cmf/routing-bundle": "To make use of the alternate locale provider.",

src/Resources/meta/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Symfony Cmf Sonata Phpcr Admin Integration Bundle
1+
Symfony CMF Sonata Phpcr Admin Integration Bundle
22

33
The MIT License
44

0 commit comments

Comments
 (0)