Skip to content

Commit 3129a42

Browse files
ElectricMaxxxElectricMaxxx
authored
DevKit updates (#237)
* DevKit updates and test calling improvements * DevKit updates * DevKit updates * DevKit updates * follow up on dev kit changes (#238) changes due to style hints revert min-stab Revert "changes due to style hints" This reverts commit 3fc2442 changes due to style hints
1 parent e8a5cce commit 3129a42

File tree

14 files changed

+229
-41
lines changed

14 files changed

+229
-41
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/core-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: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +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-
- 7.0
19+
- 7.1
520

621
sudo: false
722

@@ -11,34 +26,47 @@ cache:
1126
- $HOME/.composer/cache/files
1227

1328
env:
14-
matrix: SYMFONY_VERSION=3.2.*
29+
matrix: SYMFONY_VERSION=3.4
1530
global:
16-
- SYMFONY_DEPRECATIONS_HELPER=42
17-
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
18-
- SYMFONY_PHPUNIT_VERSION=5.7
31+
- SYMFONY_DEPRECATIONS_HELPER=48
32+
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
33+
- TEST_INSTALLATION=false
1934

2035
matrix:
2136
include:
22-
- php: 5.6
23-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
2437
- php: 7.1
25-
env: DEPS=dev SYMFONY_VERSION=3.3.*
38+
env: SYMFONY_VERSION=3.4.*
2639
- php: 7.1
40+
env: DEPS=dev SYMFONY_VERSION=3.3.*
41+
- php: 5.6
42+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
43+
- php: 7.0
2744
env: SYMFONY_VERSION=3.1.*
28-
- php: hhvm
29-
dist: trusty
45+
- php: 7.0
46+
env: SYMFONY_VERSION=3.2.*
47+
48+
- env: TEST_INSTALLATION=true
3049
fast_finish: true
50+
allow_failures:
51+
- php: 7.1
52+
env: SYMFONY_VERSION=3.4.*
53+
- env: TEST_INSTALLATION=true
54+
3155

3256
before_install:
3357
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
3458
- phpenv config-rm xdebug.ini || true
3559
- composer self-update
3660
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
3761
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
62+
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
63+
64+
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
3865

39-
install: composer update --prefer-dist $COMPOSER_FLAGS
66+
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
4067

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

4371
notifications:
4472
irc: "irc.freenode.org#symfony-cmf"

‎Makefile

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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/core-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+
test: unit_tests functional_tests_phpcr

‎README.md

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,46 @@
11
# Symfony CMF Core Bundle
22

3-
[![Build Status](https://travis-ci.org/symfony-cmf/core-bundle.svg?branch=master)](https://travis-ci.org/symfony-cmf/core-bundle)
4-
[![StyleCI](https://styleci.io/repos/1443095/shield)](https://styleci.io/repos/1443095)
5-
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/core-bundle/version.png)](https://packagist.org/packages/symfony-cmf/core-bundle)
6-
[![Total Downloads](https://poser.pugx.org/symfony-cmf/core-bundle/d/total.png)](https://packagist.org/packages/symfony-cmf/core-bundle)
3+
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/core-bundle/v/stable)](https://packagist.org/packages/symfony-cmf/core-bundle)
4+
[![Latest Unstable Version](https://poser.pugx.org/symfony-cmf/core-bundle/v/unstable)](https://packagist.org/packages/symfony-cmf/core-bundle)
5+
[![License](https://poser.pugx.org/symfony-cmf/core-bundle/license)](https://packagist.org/packages/symfony-cmf/core-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/core-bundle/downloads)](https://packagist.org/packages/symfony-cmf/core-bundle)
8+
[![Monthly Downloads](https://poser.pugx.org/symfony-cmf/core-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/core-bundle)
9+
[![Daily Downloads](https://poser.pugx.org/symfony-cmf/core-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/core-bundle)
10+
11+
Branch | Travis | Coveralls |
12+
------ | ------ | --------- |
13+
master | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] |
14+
master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
15+
16+
This bundle is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
17+
under the [MIT License](LICENSE).
1018

1119
The CoreBundle for the Symfony content management framework provides common functionality,
1220
helpers and utilities for the other CMF bundles. The major features are a publish workflow,
13-
a twig extension and php templating helper to walk PHPCR-ODM trees and support for optional
14-
translated content.
21+
a twig extension and php templating helper to walk PHPCR-ODM trees and support for optional translated content.
1522

1623

1724
## Requirements
1825

19-
* PHP 5.6 / 7
20-
* Symfony 2.8 / 3
26+
* PHP 5.6 / 7.0 / 7.1
27+
* Symfony 2.8 / 3.1 / 3.2 / 3.3
28+
* See also the `require` section of [composer.json](composer.json)
2129

2230
## Documentation
2331

2432
For the install guide and reference, see:
2533

26-
* [CoreBundle documentation](http://symfony.com/doc/master/cmf/bundles/core/index.html)
34+
* [symfony-cmf/core-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/core/index.html)
2735

2836
See also:
2937

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

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

3445
## Contributing
3546

@@ -42,4 +53,22 @@ Unit and/or functional tests exist for this bundle. See the
4253
for a guide to running the tests.
4354

4455
Thanks to
45-
[everyone who has contributed](https://github.com/symfony-cmf/CoreBundle/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/core-bundle.svg?branch=master
63+
[travis_legacy_link]: https://travis-ci.org/symfony-cmf/core-bundle
64+
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/core-bundle.svg?branch=master
65+
[travis_stable_link]: https://travis-ci.org/symfony-cmf/core-bundle
66+
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/core-bundle.svg?branch=master
67+
[travis_unstable_link]: https://travis-ci.org/symfony-cmf/core-bundle
68+
69+
[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/core-bundle/badge.svg?branch=master
70+
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/core-bundle?branch=master
71+
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/core-bundle/badge.svg?branch=master
72+
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/core-bundle?branch=master
73+
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/core-bundle/badge.svg?branch=master
74+
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/core-bundle?branch=master

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
"symfony/phpunit-bridge": "^3.2",
2121
"mockery/mockery": "^0.9.4",
2222
"symfony-cmf/routing-bundle": "^2.0",
23-
"symfony-cmf/testing": "^2.0",
23+
"symfony-cmf/testing": "^2.1@dev",
2424
"doctrine/dbal": "2.5.*",
2525
"doctrine/phpcr-odm": "^1.0"
2626
},
27-
"prefer-stable": true,
2827
"suggest": {
2928
"symfony/twig-bundle": "To get access to the CMF twig extension (^2.1)",
3029
"doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)",
@@ -48,5 +47,6 @@
4847
"branch-alias": {
4948
"dev-master": "2.1-dev"
5049
}
51-
}
50+
},
51+
"prefer-stable": true
5252
}

‎phpunit.xml.dist

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
>
88

99
<testsuites>
10-
<testsuite name="Symfony CoreBundle Test Suite">
10+
<testsuite name="unit tests">
1111
<directory>./tests/Unit</directory>
1212
</testsuite>
1313

14-
<testsuite name="phpcr">
14+
<testsuite name="functional tests with phpcr">
1515
<directory>./tests/Functional</directory>
1616
</testsuite>
1717
</testsuites>
@@ -30,8 +30,4 @@
3030
<server name="KERNEL_DIR" value="tests/Resources/app" />
3131
</php>
3232

33-
<listeners>
34-
<listener class="Symfony\Cmf\Component\Testing\Phpunit\DatabaseTestListener" />
35-
</listeners>
36-
3733
</phpunit>

0 commit comments

Comments
 (0)