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

DevKit updates #139

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/Bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Bug Report
about: Report errors and problems

---

<!--
The Symfony Code of Conduct applies to all the activity on this repository.
See https://symfony.com/doc/current/contributing/code_of_conduct/index.html
-->

**Description**
<!-- A clear and concise description of the problem. -->

**How to reproduce**
<!-- Code and/or config needed to reproduce the problem. If it's a complex bug,
create a "bug reproducer" as explained in:
https://symfony.com/doc/current/contributing/code/reproducer.html -->

**Possible Solution**
<!--- Optional: only if you have suggestions on a fix/reason for the bug -->

**Additional context**
<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
10 changes: 10 additions & 0 deletions .github/Documentation_issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Documentation Issue
about: Anything related to Symfony CMF Documentation

---

Symfony CMF Documentation has its own dedicated repository. Please open your
documentation-related issue at https://github.com/symfony-cmf/symfony-cmf-docs/issues

Thanks!
12 changes: 12 additions & 0 deletions .github/Feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Feature Request
about: RFC and ideas for new features and improvements

---

**Description**
<!-- A clear and concise description of the new feature. -->

**Example**
<!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
If the new feature changes an existing feature, include a simple before/after comparison. -->
9 changes: 9 additions & 0 deletions .github/Security_issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: Security Issue
about: Report security-related errors

---

If you have found a security issue in Symfony, please send the details to
[David](mailto:[email protected]) or [Maximilian](mailto:[email protected]) and don't disclose it publicly until we can provide a
fix for it.
15 changes: 15 additions & 0 deletions .github/Support_question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Support Question
about: Questions about using Symfony CMF and its components

---

**Description**
<!-- A clear and concise description of the problem. -->

**How to reproduce (optional)**
<!-- Optional: Only if you have something to reproduce. Code and/or config needed to reproduce the problem. -->

**Possible Solution**
<!-- Optional: only if you have suggestions to solve it -->

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ tests/Fixtures/App/var/logs
!tests/Fixtures/App/var/.gitempty
composer.lock
vendor
build/
.php_cs.cache
64 changes: 64 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?php

/**
* DO NOT EDIT THIS FILE!
*
* It's auto-generated by sonata-project/dev-kit package.
*/

$header = <<<'HEADER'
This file is part of the Symfony CMF package.

(c) Symfony CMF

For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
HEADER;

$rules = [
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => [
'syntax' => 'short',
],
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'header_comment' => [
'header' => $header,
],
'no_extra_blank_lines' => true,
'no_php4_constructor' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'phpdoc_order' => true,
'@PHP56Migration' => true,
'@PHP56Migration:risky' => true,
'@PHPUnit57Migration:risky' => true,
'@PHP70Migration' => true,
'@PHP70Migration:risky' => true,
'@PHPUnit60Migration:risky' => true,
'@PHP71Migration' => true,
'@PHP71Migration:risky' => true,
'compact_nullable_typehint' => true,
'void_return' => null,
'strict_comparison' => true,
'strict_param' => true,
];


$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude('Tests/Fixtures')
->exclude('tests/Fixtures')
->exclude('Resources/skeleton')
->exclude('Resources/public/vendor')
;

return PhpCsFixer\Config::create()
->setFinder($finder)
->setRiskyAllowed(true)
->setRules($rules)
->setUsingCache(true)
;
2 changes: 1 addition & 1 deletion .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
############################################################################
# This file is part of the Symfony CMF package. #
# #
# (c) 2011-2017 Symfony CMF #
# (c) Symfony CMF #
# #
# For the full copyright and license information, please view the LICENSE #
# file that was distributed with this source code. #
Expand Down
49 changes: 30 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
############################################################################
# This file is part of the Symfony CMF package. #
# #
# (c) 2011-2017 Symfony CMF #
# (c) Symfony CMF #
# #
# For the full copyright and license information, please view the LICENSE #
# file that was distributed with this source code. #
Expand All @@ -17,7 +17,8 @@ language: php

php:
- 7.1

- 7.2
- 7.3
sudo: false

cache:
Expand All @@ -26,40 +27,50 @@ cache:
- $HOME/.composer/cache/files

env:
matrix: SYMFONY_VERSION=4.0.*
matrix: SYMFONY_VERSION=4.2.*
global:
- SYMFONY_DEPRECATIONS_HELPER=0
- SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
- KERNEL_CLASS=Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Fixtures\App\Kernel
- SYMFONY_PHPUNIT_VERSION=5.7
- TEST_INSTALLATION=false
- SYMFONY_PHPUNIT_VERSION=7
- PHPUNIT_VERSION=7
- TARGET=test

matrix:
include:
- env: TARGET=lint
- php: 7.3
env: STABILITY="dev" SYMFONY_VERSION=4.3.*
- php: 7.3
env: SYMFONY_VERSION=4.2.*
- php: 7.1
env: STABILITY=dev SYMFONY_VERSION=4.0.*
- php: 7.1
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
- php: 7.1
env: STABILITY=dev SYMFONY_VERSION=3.3.*
- php: 7.1
env: STABILITY=dev SYMFONY_VERSION=3.4.*
- env: TEST_INSTALLATION=true
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=3.4.* SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"

- php: 7.2
env: SYMFONY_VERSION=4.1.*
- env: TARGET=test_installation
fast_finish: true
allow_failures:
- env: TEST_INSTALLATION=true
- php: 7.3
env: STABILITY="dev" SYMFONY_VERSION=4.3.*
- env: TARGET=test_installation

before_install:
- phpenv config-rm xdebug.ini || true
- composer self-update
- composer validate --no-check-all --ansi
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)

install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
install:
- phpenv config-add travis.php.ini
- php -ini | grep memory_limit
- if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;

script: make $TARGET

script:
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
after_success:
- if [ -x .travis/after_success_${TARGET}.sh ]; then .travis/after_success_${TARGET}.sh; fi;

notifications:
irc: "irc.freenode.org#symfony-cmf"
5 changes: 5 additions & 0 deletions .travis/after_success_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

#!/usr/bin/env sh
set -ev

coveralls -v
11 changes: 11 additions & 0 deletions .travis/install_lint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env sh
set -ev

mkdir --parents "${HOME}/bin"

wget "http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar" --output-document="${HOME}/bin/php-cs-fixer"
chmod u+x "${HOME}/bin/php-cs-fixer"

composer global require sllh/composer-lint:@stable --prefer-dist --no-interaction

gem install yaml-lint
19 changes: 19 additions & 0 deletions .travis/install_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env sh
set -ev

mkdir --parents "${HOME}/bin"

wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit"
chmod u+x "${HOME}/bin/phpunit"

# Coveralls client install
wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
chmod u+x "${HOME}/bin/coveralls"

# To be removed when these issues are resolved:
# https://github.com/composer/composer/issues/5355
if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
composer update --prefer-dist --no-interaction --prefer-stable --quiet
fi

composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
61 changes: 54 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
############################################################################
# This file is part of the Symfony CMF package. #
# #
# (c) 2011-2017 Symfony CMF #
# (c) Symfony CMF #
# #
# For the full copyright and license information, please view the LICENSE #
# file that was distributed with this source code. #
Expand All @@ -20,16 +20,63 @@ ifdef BRANCH
VERSION=dev-${BRANCH}
endif
PACKAGE=symfony-cmf/sonata-phpcr-admin-integration-bundle
export KERNEL_CLASS=Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Fixtures\App\Kernel
HAS_XDEBUG=$(shell php --modules|grep --quiet xdebug;echo $$?)

list:
@echo 'test: will run all tests'
@echo 'unit_tests: will run unit tests only'
@echo 'functional_tests_phpcr: will run functional tests with PHPCR'

@echo 'test_installation: will run installation test'
include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
include ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk
include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk
@echo 'test_installation: will run installation test'TEST_DEPENDENCIES := ""
EXTRA_INCLUDES:=$(wildcard ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk)
ifneq ($(strip $(EXTRA_INCLUDES)),)
contents := $(shell echo including extra rules $(EXTRA_INCLUDES))
include $(EXTRA_INCLUDES)
TEST_DEPENDENCIES := $(TEST_DEPENDENCIES)" unit_tests"
endif
EXTRA_INCLUDES:=$(wildcard ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk)
ifneq ($(strip $(EXTRA_INCLUDES)),)
contents := $(shell echo including extra rules $(EXTRA_INCLUDES))
include $(EXTRA_INCLUDES)
TEST_DEPENDENCIES := $(TEST_DEPENDENCIES)" functional_tests_phpcr"
endif
EXTRA_INCLUDES:=$(wildcard ${TESTING_SCRIPTS_DIR}/make/test_installation.mk)
ifneq ($(strip $(EXTRA_INCLUDES)),)
contents := $(shell echo including extra rules $(EXTRA_INCLUDES))
include $(EXTRA_INCLUDES)
endif

.PHONY: test
test: unit_tests functional_tests_phpcr
test: build/xdebug-filter.php$
ifneq ($(strip $(wildcard ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk)),)
@make unit_tests
endif
ifneq ($(strip $(wildcard ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk)),)
@make functional_tests_phpcr
endif

lint-php:
php-cs-fixer fix --ansi --verbose --diff --dry-run
.PHONY: lint-php

lint: lint-composer lint-php
.PHONY: lint

lint-composer:
composer validate
.PHONY: lint-composer

cs-fix: cs-fix-php
.PHONY: cs-fix

cs-fix-php:
php-cs-fixer fix --verbose
.PHONY: cs-fix-php

build:
mkdir $@

build/xdebug-filter.php: phpunit.xml.dist build
ifeq ($(HAS_XDEBUG), 0)
phpunit --dump-xdebug-filter $@
endif
Loading