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

Commit f3770e5

Browse files
ElectricMaxxxElectricMaxxx
authored
DevKit updates for master branch (#57)
* DevKit updates * improvements to get the tests running * DevKit updates * try to call unit tests only * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * add correct cache/log path to gitignor * restriction on sebastion/exporter * fix composer.json * use higher versions * DevKit updates * DevKit updates * DevKit updates * use higher version * try verbose * try testdox * try makefile change * try travis * back * restrict sebastianbergmann/environment * restrict sebastianbergmann/environment * try to turn around
1 parent 80c1c05 commit f3770e5

File tree

13 files changed

+240
-120
lines changed

13 files changed

+240
-120
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-rest-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

‎.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Tests/Resources/app/cache
2-
Tests/Resources/app/logs
3-
Tests/Resources/data
1+
tests/Resources/app/cache
2+
tests/Resources/app/logs
43
composer.lock
54
vendor

‎.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: 39 additions & 18 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,44 +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.*
15-
global: SYMFONY_PHPUNIT_DIR="./.phpunit" SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
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
1635

1736
matrix:
1837
include:
1938
- php: 7.1
20-
env: SYMFONY_VERSION=3.3.* DEPS=dev
21-
- php: 5.6
22-
env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest"
39+
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
40+
- php: 7.1
41+
env: DEPS=dev SYMFONY_VERSION=3.3.*
2342
- php: 7.0
43+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
44+
- php: 7.1
2445
env: SYMFONY_VERSION=3.1.*
25-
- php: hhvm
26-
dist: trusty
46+
- php: 7.1
47+
env: SYMFONY_VERSION=3.2.*
48+
- env: TEST_INSTALLATION=true
49+
2750
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+
2856

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

36-
install: composer update --prefer-dist $COMPOSER_FLAGS
37-
38-
before_script:
39-
- mv vendor/phpunit ./phpunit
40-
- composer dump-autoload
41-
- vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
65+
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
4266

4367
script:
44-
- vendor/bin/simple-phpunit
45-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/symfony-cmf/testing/bin/server & fi
46-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv ./phpunit vendor/phpunit; composer dump-autoload; fi
47-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/bin/behat; fi
68+
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
4869

4970
notifications:
5071
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: 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/resource-rest-bundle
23+
24+
list:
25+
@echo 'test: will run all tests'
26+
@echo 'unit_tests: will run unit tests only'
27+
28+
29+
@echo 'test_installation: will run installation test'
30+
include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
31+
include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk
32+
33+
.PHONY: test
34+
test: unit_tests

0 commit comments

Comments
 (0)