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

Commit 136af0d

Browse files
ElectricMaxxxElectricMaxxx
authored
Master dev kit (#215)
* DevKit updates * DevKit updates * improvements to get tests running
1 parent 776f2f7 commit 136af0d

File tree

12 files changed

+237
-40
lines changed

12 files changed

+237
-40
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-auto-bundle/blob/master/CONTRIBUTING.md#issues
43+
-->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Q | A
2+
| ------------- | ---
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
9+
| License | MIT
10+
| Doc PR | reference to the documentation PR, if any

‎.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: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,71 @@
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
17+
218
php:
319
- 7.1
420

521
sudo: false
622

723
cache:
824
directories:
9-
- $HOME/.composer/cache/files
1025
- .phpunit
26+
- $HOME/.composer/cache/files
1127

1228
env:
13-
matrix: SYMFONY_VERSION=3.3.*
14-
global: SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
29+
matrix: SYMFONY_VERSION=^3.4@dev
30+
global:
31+
- SYMFONY_DEPRECATIONS_HELPER=24
32+
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
33+
- SYMFONY_PHPUNIT_VERSION=5.7
34+
- TEST_INSTALLATION=false
1535

1636
matrix:
1737
include:
1838
- php: 7.1
39+
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
40+
- php: 7.1
41+
env: DEPS=dev SYMFONY_VERSION=3.3.*
42+
- php: 5.6
43+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
44+
- php: 7.0
45+
env: SYMFONY_VERSION=3.1.*
1946
- php: 7.0
2047
env: SYMFONY_VERSION=3.2.*
21-
- php: 5.6
22-
env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
23-
- php: hhvm
24-
dist: trusty
48+
- env: TEST_INSTALLATION=true
49+
2550
fast_finish: true
51+
allow_failures:
52+
- php: 7.1
53+
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
54+
- env: TEST_INSTALLATION=true
55+
2656

2757
before_install:
28-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
58+
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
2959
- phpenv config-rm xdebug.ini || true
30-
- composer selfupdate
60+
- composer self-update
3161
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
3262
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
63+
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
3364

34-
install: composer update $COMPOSER_FLAGS --prefer-dist
35-
36-
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
65+
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
3766

38-
script: vendor/bin/simple-phpunit
67+
script:
68+
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
3969

4070
notifications:
4171
irc: "irc.freenode.org#symfony-cmf"

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Contributing
22
------------
33

4-
Symfony2 CMF is an open source, community-driven project. We follow the same
5-
guidelines as core Symfony2. If you'd like to contribute, please read the
4+
Symfony CMF is an open source, community-driven project. We follow the same
5+
guidelines as core Symfony. If you'd like to contribute, please read the
66
[Contributing Code][1] part of the documentation. If you're submitting a pull
77
request, please follow the guidelines in the [Submitting a Patch][2] section
88
and use the [Pull Request Template][3].

‎Makefile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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-auto-bundle
23+
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+
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/test_installation.mk
33+
34+
.PHONY: test
35+
test: unit_tests functional_tests_phpcr

‎README.md

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,71 @@
11
# Symfony CMF Routing Auto Bundle
22

3-
[![Build Status](https://travis-ci.org/symfony-cmf/routing-auto-bundle.svg?branch=master)](https://travis-ci.org/symfony-cmf/routing-auto-bundle)
4-
[![StyleCI](https://styleci.io/repos/8671509/shield)](https://styleci.io/repos/8671509)
5-
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing-auto-bundle/version.png)](https://packagist.org/packages/symfony-cmf/routing-auto-bundle)
6-
[![Total Downloads](https://poser.pugx.org/symfony-cmf/routing-auto-bundle/d/total.png)](https://packagist.org/packages/symfony-cmf/routing-auto-bundle)
3+
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing-auto-bundle/v/stable)](https://packagist.org/packages/symfony-cmf/routing-auto-bundle)
4+
[![Latest Unstable Version](https://poser.pugx.org/symfony-cmf/routing-auto-bundle/v/unstable)](https://packagist.org/packages/symfony-cmf/routing-auto-bundle)
5+
[![License](https://poser.pugx.org/symfony-cmf/routing-auto-bundle/license)](https://packagist.org/packages/symfony-cmf/routing-auto-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-auto-bundle/downloads)](https://packagist.org/packages/symfony-cmf/routing-auto-bundle)
8+
[![Monthly Downloads](https://poser.pugx.org/symfony-cmf/routing-auto-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/routing-auto-bundle)
9+
[![Daily Downloads](https://poser.pugx.org/symfony-cmf/routing-auto-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/routing-auto-bundle)
1010

11+
Branch | Travis | Coveralls |
12+
------ | ------ | --------- |
13+
master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
1114

12-
This bundle automatically creates and manages routes for configured persisted
13-
document classes.
15+
This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
16+
under the [MIT License](LICENSE).
1417

15-
## Requirements
18+
This bundle automatically creates and manages routes for configured persisted document classes.
1619

17-
* Symfony 2.8+
20+
21+
## Requirements
22+
23+
* PHP 5.6 / 7.0 / 7.1
24+
* Symfony 2.8 / 3.1 / 3.2 / 3.3
1825
* See also the `require` section of [composer.json](composer.json)
1926

2027
## Documentation
2128

2229
For the install guide and reference, see:
2330

24-
* [RoutingAuto documentation](http://symfony.com/doc/master/cmf/bundles/routing_auto/index.html)
31+
* [symfony-cmf/routing-auto-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/routing-auto-bundle/index.html)
2532

2633
See also:
2734

28-
* [Creating a basic CMS (with RoutingAuto)](http://symfony.com/doc/master/cmf/cookbook/creating_a_cms/index.html)
2935
* [All Symfony CMF documentation](http://symfony.com/doc/master/cmf/index.html) - complete Symfony CMF reference
3036
* [Symfony CMF Website](http://cmf.symfony.com/) - introduction, live demo, support and community links
3137

38+
## Support
39+
40+
For general support and questions, please use [StackOverflow](http://stackoverflow.com/questions/tagged/symfony-cmf).
41+
3242
## Contributing
3343

3444
Pull requests are welcome. Please see our
3545
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
3646
guide.
3747

38-
Unit and/or functional tests exist for this bundle. See the
48+
Unit and/or functional tests exist for this package. See the
3949
[Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
4050
for a guide to running the tests.
4151

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

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"symfony-cmf/routing-auto": "^2.0.0-RC5",
1616
"symfony-cmf/routing-bundle": "^1.2.0|^2.0",
1717
"aferrandini/urlizer": "1.0.*",
18-
"phpdocumentor/reflection-docblock": "^3.1, !=3.2.0"
18+
"phpdocumentor/reflection-docblock": "^3.1, !=3.2.0",
19+
"symfony-cmf/testing": "^2.1@dev"
1920
},
2021
"require-dev": {
21-
"symfony-cmf/testing": "^1.3|^2.0",
2222
"symfony/phpunit-bridge": "^3.2",
2323
"symfony/yaml": "^2.8|^3.0",
2424
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
@@ -42,7 +42,7 @@
4242
},
4343
"extra": {
4444
"branch-alias": {
45-
"dev-master": "2.0-dev"
45+
"dev-master": "2.1-dev"
4646
}
4747
},
4848
"scripts": {

0 commit comments

Comments
 (0)