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

Commit d670117

Browse files
ElectricMaxxxElectricMaxxx
authored
DevKit updates (#47)
* DevKit updates * improvements to get tests running * due to style hints * create two suites * DevKit updates * DevKit updates * add changelog entry that we dropped hhvm support
1 parent 67f44c3 commit d670117

30 files changed

+274
-69
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/resource-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: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +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
18+
219
enabled:
3-
- short_array_syntax
20+
- combine_consecutive_unsets
21+
- short_array_syntax
22+
- newline_after_open_tag
23+
- no_php4_constructor
24+
- no_useless_else
25+
- ordered_use
26+
- strict
27+
- php_unit_construct
28+
29+
disabled: [single_line_class_definition]

‎.travis.yml‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
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:
@@ -7,39 +22,50 @@ sudo: false
722

823
cache:
924
directories:
10-
- $HOME/.composer/cache/files
1125
- .phpunit
26+
- $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=2
17-
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
31+
- SYMFONY_DEPRECATIONS_HELPER=48
32+
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
33+
- SYMFONY_PHPUNIT_VERSION=5.7
34+
- TEST_INSTALLATION=false
1835

1936
matrix:
2037
include:
21-
- php: 5.6
22-
env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
2338
- php: 7.1
24-
env: SYMFONY_VERSION=3.3.* DEPS=dev
39+
env: SYMFONY_VERSION=3.4.*
40+
- php: 7.1
41+
env: DEPS=dev SYMFONY_VERSION=3.3.*
2542
- php: 7.0
43+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
44+
- php: 7.1
2645
env: SYMFONY_VERSION=3.1.*
27-
- php: hhvm
28-
dist: trusty
46+
- php: 7.1
47+
env: SYMFONY_VERSION=3.2.*
48+
- env: TEST_INSTALLATION=true
49+
2950
fast_finish: true
51+
allow_failures:
52+
- php: 7.1
53+
env: SYMFONY_VERSION=3.4.*
54+
- env: TEST_INSTALLATION=true
55+
3056

3157
before_install:
3258
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
3359
- phpenv config-rm xdebug.ini || true
3460
- composer self-update
3561
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
3662
- 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)
3764

38-
install: composer update --prefer-dist $COMPOSER_FLAGS
39-
40-
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
65+
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
4166

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

4470
notifications:
4571
irc: "irc.freenode.org#symfony-cmf"

‎CHANGELOG.md‎

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

4+
5+
* **2017-10-24**: Dropped hhvm support
6+
47
1.0.0
58
-----
69

‎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/resource-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: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
# Symfony CMF Resource Bundle
22

3-
[![Build Status](https://travis-ci.org/symfony-cmf/resource-bundle.svg?branch=master)](https://travis-ci.org/symfony-cmf/resource-bundle)
4-
[![StyleCI](https://styleci.io/repos/26688804/shield)](https://styleci.io/repos/26688804)
5-
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/resource-bundle/version.png)](https://packagist.org/packages/symfony-cmf/resource-bundle)
6-
[![Total Downloads](https://poser.pugx.org/symfony-cmf/resource-bundle/d/total.png)](https://packagist.org/packages/symfony-cmf/resource-bundle)
3+
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/resource-bundle/v/stable)](https://packagist.org/packages/symfony-cmf/resource-bundle)
4+
[![Latest Unstable Version](https://poser.pugx.org/symfony-cmf/resource-bundle/v/unstable)](https://packagist.org/packages/symfony-cmf/resource-bundle)
5+
[![License](https://poser.pugx.org/symfony-cmf/resource-bundle/license)](https://packagist.org/packages/symfony-cmf/resource-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/resource-bundle/downloads)](https://packagist.org/packages/symfony-cmf/resource-bundle)
8+
[![Monthly Downloads](https://poser.pugx.org/symfony-cmf/resource-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/resource-bundle)
9+
[![Daily Downloads](https://poser.pugx.org/symfony-cmf/resource-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/resource-bundle)
10+
11+
Branch | Travis | Coveralls |
12+
------ | ------ | --------- |
13+
master | [![Build Status][travis_unstable_badge]][travis_unstable_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
This bundle provides *object* resource location services based on Puli.
1219

@@ -26,28 +33,55 @@ document resource resolution.
2633
For example, a `Site` which is matched against the incoming hostname would
2734
provide the context with which to resolve the documents.
2835

29-
## Requirements
3036

31-
* Symfony 2.8+
37+
## Requirements
38+
39+
* PHP 7.0 / 7.1
40+
* Symfony 2.8 / 3.1 / 3.2 / 3.3
3241
* See also the `require` section of [composer.json](composer.json)
3342

3443
## Documentation
3544

36-
Not yet.
45+
For the install guide and reference, see:
46+
47+
* [symfony-cmf/resource-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/resource-rest/index.html)
48+
49+
See also:
3750

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

54+
## Support
55+
56+
For general support and questions, please use [StackOverflow](http://stackoverflow.com/questions/tagged/symfony-cmf).
57+
4158
## Contributing
4259

4360
Pull requests are welcome. Please see our
4461
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
4562
guide.
4663

47-
Unit and/or functional tests exist for this bundle. See the
64+
Unit and/or functional tests exist for this package. See the
4865
[Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
4966
for a guide to running the tests.
5067

5168
Thanks to
52-
[everyone who has contributed](https://github.com/symfony-cmf/ResourceBundle/contributors) already.
53-
## Running the tests
69+
[everyone who has contributed](contributors) already.
70+
71+
## License
72+
73+
This package is available under the [MIT license](src/Resources/meta/LICENSE).
74+
75+
[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/resource-bundle.svg?branch=master
76+
[travis_legacy_link]: https://travis-ci.org/symfony-cmf/resource-bundle
77+
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/resource-bundle.svg?branch=master
78+
[travis_stable_link]: https://travis-ci.org/symfony-cmf/resource-bundle
79+
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/resource-bundle.svg?branch=master
80+
[travis_unstable_link]: https://travis-ci.org/symfony-cmf/resource-bundle
81+
82+
[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/resource-bundle/badge.svg?branch=master
83+
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/resource-bundle?branch=master
84+
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/resource-bundle/badge.svg?branch=master
85+
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/resource-bundle?branch=master
86+
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/resource-bundle/badge.svg?branch=master
87+
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/resource-bundle?branch=master

0 commit comments

Comments
 (0)