Skip to content

Commit 4ceabf4

Browse files
dbudbu
committed
Merge branch 'compiler-pass-test' into 2.0
2 parents ebc63f9 + 64cfaef commit 4ceabf4

Some content is hidden

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

54 files changed

+522
-131
lines changed

‎.editorconfig‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
indent_style = space
6+
charset = utf-8
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
[*.{yml,twig,php}]
11+
indent_size = 4
12+
13+
[*.{js,json,scss,css}]
14+
indent_size = 2
15+
16+
[.travis.yml]
17+
indent_size = 2
18+
19+
[composer.json]
20+
indent_size = 4
21+
22+
[Makefile]
23+
indent_style = tab

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.* export-ignore
2+
*.md export-ignore
3+
Tests/* export-ignore

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!--
2+
Before you open an issue, make sure this one does not already exist.
3+
Please also read the "guidelines for contributing" link above before posting.
4+
-->
5+
6+
<!--
7+
If you are reporting a bug, please try to fill in the following.
8+
Otherwise remove it.
9+
-->
10+
11+
### Environment
12+
13+
#### Symfony packages
14+
15+
```
16+
$ composer show --latest 'symfony/*'
17+
```
18+
19+
#### Symfony CMF packages
20+
21+
```
22+
$ composer show --latest 'symfony-cmf/*'
23+
```
24+
25+
## Subject
26+
27+
<!--
28+
Give here as many details as possible.
29+
Next sections are for ERRORS only.
30+
-->
31+
32+
## Steps to reproduce
33+
34+
## Expected results
35+
36+
## Actual results
37+
38+
<!--
39+
If it's an error message or piece of code, use code block tags,
40+
and make sure you provide the whole stack trace(s),
41+
not just the first error message you can see.
42+
More details here: https://github.com/symfony-cmf/routing-bundle/blob/master/CONTRIBUTING.md#issues
43+
-->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
| Q | A
22
| ------------- | ---
3-
| Bug fix? | [yes|no]
4-
| New feature? | [yes|no]
5-
| BC breaks? | [yes|no]
6-
| Deprecations? | [yes|no]
7-
| Tests pass? | [yes|no]
8-
| Fixed tickets | [comma-separated list of tickets fixed by the PR, if any]
3+
| Branch? | "master" for new features / the branch of the current release for fixes
4+
| Bug fix? | yes/no
5+
| New feature? | yes/no
6+
| BC breaks? | yes/no
7+
| Deprecations? | yes/no
8+
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
99
| License | MIT
10-
| Doc PR | [reference to the documentation PR, if any]
10+
| Doc PR | reference to the documentation PR, if any

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
phpunit.xml
22
composer.lock
33
vendor
4-
tests/Resources/app/cache
5-
tests/Resources/app/logs
4+
tests/Fixtures/App/var/

‎.styleci.yml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
1+
#######################################################
2+
# DO NOT EDIT THIS FILE! #
3+
# #
4+
# It's auto-generated by symfony-cmf/dev-kit package. #
5+
#######################################################
6+
7+
############################################################################
8+
# This file is part of the Symfony CMF package. #
9+
# #
10+
# (c) 2011-2017 Symfony CMF #
11+
# #
12+
# For the full copyright and license information, please view the LICENSE #
13+
# file that was distributed with this source code. #
14+
############################################################################
15+
16+
117
preset: symfony
218

319
enabled:
4-
- ordered_use
20+
- combine_consecutive_unsets
521
- short_array_syntax
6-
22+
- newline_after_open_tag
23+
- no_php4_constructor
24+
- no_useless_else
25+
- ordered_use
26+
- strict
27+
- php_unit_construct
28+
729
disabled: [single_line_class_definition]

‎.travis.yml‎

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
1+
#######################################################
2+
# DO NOT EDIT THIS FILE! #
3+
# #
4+
# It's auto-generated by symfony-cmf/dev-kit package. #
5+
#######################################################
6+
7+
############################################################################
8+
# This file is part of the Symfony CMF package. #
9+
# #
10+
# (c) 2011-2017 Symfony CMF #
11+
# #
12+
# For the full copyright and license information, please view the LICENSE #
13+
# file that was distributed with this source code. #
14+
############################################################################
15+
116
language: php
217

318
php:
4-
- 5.6
5-
- 7.0
19+
- 7.1
620

721
sudo: false
822

@@ -12,37 +26,40 @@ cache:
1226
- $HOME/.composer/cache/files
1327

1428
env:
15-
matrix:
16-
- SYMFONY_VERSION=3.2.*
29+
matrix: SYMFONY_VERSION=4.0.*
1730
global:
18-
- SYMFONY_DEPRECATIONS_HELPER=4
19-
- SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_DIR="./.phpunit" SYMFONY_PHPUNIT_VERSION=5.7
31+
- SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
32+
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
33+
- KERNEL_CLASS=Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel
34+
- SYMFONY_PHPUNIT_VERSION=5.7
35+
- TEST_INSTALLATION=false
2036

2137
matrix:
2238
include:
39+
- php: 7.2
40+
env: STABILITY=dev SYMFONY_VERSION=4.0.*
2341
- php: 7.1
24-
env: DEPS=dev SYMFONY_VERSION=3.3.*
25-
- php: 5.6
26-
# phpcr/phpcr 2.1.2 requirement is needed to not confuse Composer
27-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak SYMFONY_VERSION="2.8.* phpcr/phpcr:2.1.2"
28-
- php: 7.1
29-
env: SYMFONY_VERSION=3.1.*
30-
- php: hhvm
31-
dist: trusty
42+
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
43+
- php: 7.2
44+
env: STABILITY=dev SYMFONY_VERSION=3.3.*
45+
- php: 7.2
46+
env: STABILITY=dev SYMFONY_VERSION=3.4.*
47+
- env: TEST_INSTALLATION=true
3248
fast_finish: true
49+
allow_failures:
50+
- env: TEST_INSTALLATION=true
3351

3452
before_install:
35-
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
3653
- phpenv config-rm xdebug.ini || true
3754
- composer self-update
38-
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
55+
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
3956
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
57+
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
4058

41-
install: composer update --prefer-dist $COMPOSER_FLAGS
42-
43-
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
59+
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
4460

45-
script: vendor/bin/simple-phpunit
61+
script:
62+
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
4663

4764
notifications:
4865
irc: "irc.freenode.org#symfony-cmf"

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
=========
33

4+
2.1.0 (unreleased)
5+
------------------
6+
7+
* **2017-11-11**: Removed php 5.6 and 7.0 support, removed Symfony 3.0.* and 3.1.* support
8+
49
2.0.3
510
-----
611

‎Makefile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#######################################################
2+
# DO NOT EDIT THIS FILE! #
3+
# #
4+
# It's auto-generated by symfony-cmf/dev-kit package. #
5+
#######################################################
6+
7+
############################################################################
8+
# This file is part of the Symfony CMF package. #
9+
# #
10+
# (c) 2011-2017 Symfony CMF #
11+
# #
12+
# For the full copyright and license information, please view the LICENSE #
13+
# file that was distributed with this source code. #
14+
############################################################################
15+
16+
TESTING_SCRIPTS_DIR=vendor/symfony-cmf/testing/bin
17+
CONSOLE=${TESTING_SCRIPTS_DIR}/console
18+
VERSION=dev-master
19+
ifdef BRANCH
20+
VERSION=dev-${BRANCH}
21+
endif
22+
PACKAGE=symfony-cmf/routing-bundle
23+
export KERNEL_CLASS=Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel
24+
list:
25+
@echo 'test: will run all tests'
26+
@echo 'unit_tests: will run unit tests only'
27+
@echo 'functional_tests_phpcr: will run functional tests with PHPCR'
28+
@echo 'functional_tests_orm: will run functional tests with ORM'
29+
@echo 'test_installation: will run installation test'
30+
include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
31+
include ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk
32+
include ${TESTING_SCRIPTS_DIR}/make/functional_tests_orm.mk
33+
include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk
34+
35+
.PHONY: test
36+
test: unit_tests functional_tests_phpcr functional_tests_orm

‎README.md‎

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
# Symfony CMF Routing Bundle
22

3-
[![Build Status](https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=master)](https://travis-ci.org/symfony-cmf/routing-bundle)
4-
[![StyleCI](https://styleci.io/repos/4221277/shield)](https://styleci.io/repos/4221277)
5-
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing-bundle/version.png)](https://packagist.org/packages/symfony-cmf/routing-bundle)
6-
[![Total Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/d/total.png)](https://packagist.org/packages/symfony-cmf/routing-bundle)
3+
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing-bundle/v/stable)](https://packagist.org/packages/symfony-cmf/routing-bundle)
4+
[![Latest Unstable Version](https://poser.pugx.org/symfony-cmf/routing-bundle/v/unstable)](https://packagist.org/packages/symfony-cmf/routing-bundle)
5+
[![License](https://poser.pugx.org/symfony-cmf/routing-bundle/license)](https://packagist.org/packages/symfony-cmf/routing-bundle)
76

8-
This bundle is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/)
9-
and licensed under the [MIT License](LICENSE).
7+
[![Total Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/downloads)](https://packagist.org/packages/symfony-cmf/routing-bundle)
8+
[![Monthly Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/routing-bundle)
9+
[![Daily Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/routing-bundle)
10+
11+
Branch | Travis | Coveralls |
12+
------ | ------ | --------- |
13+
master | [![Build Status][travis_unstable_badge]][travis_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
14+
15+
This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
16+
under the [MIT License](LICENSE).
1017

1118
The RoutingBundle enables the
1219
[CMF Routing component](https://github.com/symfony-cmf/Routing)
@@ -16,32 +23,50 @@ controller for redirection routes.
1623

1724
## Requirements
1825

19-
* PHP 5.6 / 7
20-
* Symfony 2.8 / 3
26+
* PHP 7.1 / 7.2
27+
* Symfony 2.8 / 3.3 / 3.4 / 4.0
2128
* See also the `require` section of [composer.json](composer.json)
2229

23-
2430
## Documentation
2531

2632
For the install guide and reference, see:
2733

28-
* [RoutingBundle documentation](http://symfony.com/doc/master/cmf/bundles/routing/index.html)
34+
* [symfony-cmf/routing-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/routing/index.html)
2935

3036
See also:
3137

3238
* [All Symfony CMF documentation](http://symfony.com/doc/master/cmf/index.html) - complete Symfony CMF reference
3339
* [Symfony CMF Website](http://cmf.symfony.com/) - introduction, live demo, support and community links
3440

41+
## Support
42+
43+
For general support and questions, please use [StackOverflow](http://stackoverflow.com/questions/tagged/symfony-cmf).
3544

3645
## Contributing
3746

3847
Pull requests are welcome. Please see our
39-
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
48+
[CONTRIBUTING](https://github.com/symfony-cmf/blob/master/CONTRIBUTING.md)
4049
guide.
4150

42-
Unit and/or functional tests exist for this bundle. See the
51+
Unit and/or functional tests exist for this package. See the
4352
[Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
4453
for a guide to running the tests.
4554

4655
Thanks to
47-
[everyone who has contributed](https://github.com/symfony-cmf/RoutingBundle/contributors) already.
56+
[everyone who has contributed](contributors) already.
57+
58+
## License
59+
60+
This package is available under the [MIT license](src/Resources/meta/LICENSE).
61+
62+
[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=master
63+
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=master
64+
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=master
65+
[travis_link]: https://travis-ci.org/symfony-cmf/routing-bundle
66+
67+
[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/routing-bundle/badge.svg?branch=master
68+
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/routing-bundle?branch=master
69+
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing-bundle/badge.svg?branch=master
70+
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/routing-bundle?branch=master
71+
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing-bundle/badge.svg?branch=master
72+
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/routing-bundle?branch=master

0 commit comments

Comments
 (0)