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

Commit 2c43785

Browse files
ElectricMaxxxElectricMaxxx
authored
Master dev kit (#123)
* DevKit updates * Improvements to run the tests * use new testing version * Apply fixes from StyleCI (#125) [ci skip] [skip ci]
1 parent b05954f commit 2c43785

Some content is hidden

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

53 files changed

+387
-185
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/sonata-phpcr-admin-integration-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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +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+
19+
enabled:
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 & 11 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:
@@ -11,33 +26,46 @@ 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=2080
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: 7.1
22-
# env: DEPS=dev SYMFONY_VERSION=3.3.*
23-
- php: 5.6
24-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
38+
- php: 7.1
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
65+
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
3966

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

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

‎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/sonata-phpcr-admin-integration-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: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,70 @@
1-
# Symfony CMF Sonata PHPCR Admin Bundle
1+
# Symfony CMF Sonata Phpcr Admin Integration Bundle
2+
3+
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/v/stable)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
4+
[![Latest Unstable Version](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/v/unstable)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
5+
[![License](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/license)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
6+
7+
[![Total Downloads](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/downloads)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
8+
[![Monthly Downloads](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
9+
[![Daily Downloads](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-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).
217

3-
[![Build Status](https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=master)](https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle)
4-
[![StyleCI](https://styleci.io/repos/60730554/shield?style=plastic)](https://styleci.io/repos/60730554)
5-
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/version.png)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
6-
[![Total Downloads](https://poser.pugx.org/symfony-cmf/sonata-phpcr-admin-integration-bundle/d/total.png)](https://packagist.org/packages/symfony-cmf/sonata-phpcr-admin-integration-bundle)
718

8-
This bundle is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/)
9-
and licensed under the [MIT License](LICENSE).
1019

1120
## Requirements
1221

13-
* PHP 5.6 / 7
14-
* Symfony 2.8 / 3
22+
* PHP 7.0 / 7.1
23+
* Symfony 2.8 / 3.1 / 3.2 / 3.3
1524
* See also the `require` section of [composer.json](composer.json)
1625

1726
## Documentation
1827

1928
For the install guide and reference, see:
2029

21-
* [CmfSonataPhpcrAdminIntegrationBundle documentation](http://symfony.com/doc/master/cmf/bundles/sonata_phpcr_admin_integration/index.html)
30+
* [symfony-cmf/sonata-phpcr-admin-integration-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/sonata-phpcr-admin-integration-bundle/index.html)
2231

2332
See also:
2433

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

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

2941
## Contributing
3042

3143
Pull requests are welcome. Please see our
3244
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
3345
guide.
3446

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

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

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"symfony-cmf/tree-browser-bundle": "^2.0"
2020
},
2121
"require-dev": {
22-
"symfony-cmf/testing": "^2.0",
22+
"symfony-cmf/testing": "^2.1@dev",
2323
"symfony-cmf/core-bundle": "^2.0",
2424
"symfony-cmf/routing-bundle": "^2.0",
2525
"symfony-cmf/seo-bundle": "^2.0",
@@ -52,7 +52,7 @@
5252
},
5353
"extra": {
5454
"branch-alias": {
55-
"dev-master": "1.0-dev"
55+
"dev-master": "1.1-dev"
5656
}
5757
}
5858
}

‎phpunit.xml.dist‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
>
66

77
<testsuites>
8-
<testsuite name="Cmf SonataPhpcrAdminIntegrationBundle Test Suite">
8+
<testsuite name="unit tests">
99
<directory>./tests/Unit</directory>
1010
</testsuite>
1111

12-
<testsuite name="phpcr">
12+
<testsuite name="functional tests with phpcr">
1313
<directory>./tests/WebTest</directory>
1414
</testsuite>
1515
</testsuites>
@@ -29,8 +29,4 @@
2929
<server name="KERNEL_DIR" value="tests/Resources/app" />
3030
</php>
3131

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

0 commit comments

Comments
 (0)