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 19 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 -->

37 changes: 18 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
language: php

php:
- 7.1
- "7.1"

sudo: false

Expand All @@ -26,38 +26,37 @@ cache:
- $HOME/.composer/cache/files

env:
matrix: SYMFONY_VERSION=4.0.*
matrix: SYMFONY_VERSION="4.2.*"
global:
- SYMFONY_DEPRECATIONS_HELPER=0
- SYMFONY_DEPRECATIONS_HELPER="weak"
- 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
- KERNEL_CLASS="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Fixtures\App\Kernel"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please move this into phpunit.xml.dist so the tests run locally. you can remove KERNEL_DIR in phpunit.xml.dist, because that is no longer used.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw: the variable is also exported in make file :-)

- SYMFONY_PHPUNIT_VERSION="6"

matrix:
include:
- 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
- php: "7.3"
env: STABILITY="dev" SYMFONY_VERSION="4.2.*"
- php: "7.1"
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION="3.4.*" SYMFONY_DEPRECATIONS_HELPER="weak"
- php: "7.2"
env: STABILITY="dev" SYMFONY_VERSION="4.0.*"
- php: "7.2"
env: STABILITY="dev" SYMFONY_VERSION="4.1.*"
fast_finish: true
allow_failures:
- env: TEST_INSTALLATION=true

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
- travis_wait composer update --prefer-dist $COMPOSER_FLAGS
script:
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi

Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ list:
@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

.PHONY: test
test: unit_tests functional_tests_phpcr
45 changes: 24 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,37 @@
[![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)
[![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)

Branch | Travis | Coveralls |
------ | ------ | --------- |
master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
Branch | Travis | Coveralls | Scrutinizer |
------ | ------ | --------- | ----------- |
1.0 | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] | [![Scrutinizer Status][scrutinizer_stable_badge]][scrutinizer_stable_link] |
1.1-dev | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] | [![Scrutinizer Status][scrutinizer_unstable_badge]][scrutinizer_unstable_link] |

This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed

This package is part of the [Symfony Content Management Framework (CMF)](https://cmf.symfony.com/) and licensed
under the [MIT License](LICENSE).



## Requirements

* PHP 7.1
* Symfony 2.8 / 3.3 / 3.4 / 4.0
* PHP 7.1 / 7.2 / 7.3
* Symfony 3.4 / 4.0 / 4.1 / 4.2
* See also the `require` section of [composer.json](composer.json)

## Documentation

For the install guide and reference, see:

* [symfony-cmf/sonata-phpcr-admin-integration-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/sonata-phpcr-admin-integration-bundle/index.html)
* [symfony-cmf/sonata-phpcr-admin-integration-bundle Documentation](https://symfony.com/doc/master/cmf/bundles/sonata-phpcr-admin-integration-bundle/index.html)

See also:

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

## Support

For general support and questions, please use [StackOverflow](http://stackoverflow.com/questions/tagged/symfony-cmf).
For general support and questions, please use [StackOverflow](https://stackoverflow.com/questions/tagged/symfony-cmf).

## Contributing

Expand All @@ -45,7 +47,7 @@ Pull requests are welcome. Please see our
guide.

Unit and/or functional tests exist for this package. See the
[Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
[Testing documentation](https://symfony.com/doc/master/cmf/components/testing.html)
for a guide to running the tests.

Thanks to
Expand All @@ -55,16 +57,17 @@ Thanks to

This package is available under the [MIT license](src/Resources/meta/LICENSE).

[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=master
[travis_legacy_link]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=master
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=1.0
[travis_stable_link]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=master
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle.svg?branch=1.1-dev
[travis_unstable_link]: https://travis-ci.org/symfony-cmf/sonata-phpcr-admin-integration-bundle

[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=master
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=master
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=master
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=master
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=master
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=master
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=1.0
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=1.0
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/sonata-phpcr-admin-integration-bundle/badge.svg?branch=1.1-dev
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/sonata-phpcr-admin-integration-bundle?branch=1.1-dev

[scrutinizer_stable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/badges/quality-score.png?b=1.0
[scrutinizer_stable_link]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/?branch=1.0
[scrutinizer_unstable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/badges/quality-score.png?b=1.1-dev
[scrutinizer_unstable_link]: https://scrutinizer-ci.com/g/symfony-cmf/sonata-phpcr-admin-integration-bundle/?branch=1.1-dev
29 changes: 13 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
],
"require": {
"php": "^7.1",
"symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
"sonata-project/doctrine-phpcr-admin-bundle": "^2.1",
"symfony/framework-bundle": "^3.4 || ^4.0",
"sonata-project/doctrine-phpcr-admin-bundle": "^2.2",
"sonata-project/admin-bundle": "^3.6.0",
"symfony-cmf/tree-browser-bundle": "^2.0"
"symfony-cmf/tree-browser-bundle": "^2.0",
"symfony/phpunit-bridge": "^4.2.2"
},
"require-dev": {
"symfony-cmf/testing": "^2.1",
"symfony-cmf/testing": "^2.1.11",
"symfony-cmf/core-bundle": "^2.1",
"symfony-cmf/routing-bundle": "^2.1",
"symfony-cmf/seo-bundle": "^2.1",
Expand All @@ -33,16 +34,14 @@
"doctrine/orm": "^2.4",
"doctrine/phpcr-odm": "^1.4|^2.0",
"doctrine/doctrine-bundle": "^1.3",
"symfony/phpunit-bridge": "^3.3 || ^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^1.1",
"matthiasnoback/symfony-config-test": "^2.1",
"symfony/phpunit-bridge": "^4.2.2",
"burgov/key-value-form-bundle": "^1.0",
"friendsofsymfony/ckeditor-bundle": "^1.0",
"sebastian/environment": "^1.3.4",
"sebastian/exporter": "^2.0.0",
"symfony/asset": "^2.8 || ^3.3 || ^4.0",
"symfony/browser-kit": "^2.8 || ^3.3 || ^4.0",
"symfony/css-selector": "^2.8 || ^3.3 || ^4.0"
"friendsofsymfony/ckeditor-bundle": "^1.0 || ^2.0",
"symfony/asset": "^3.4 || ^4.0",
"symfony/browser-kit": "^3.4 || ^4.0",
"symfony/css-selector": "^3.4 || ^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.1",
"matthiasnoback/symfony-config-test": "^4.0"
},
"suggest": {
"symfony-cmf/routing-bundle": "To make use of the alternate locale provider.",
Expand All @@ -65,7 +64,5 @@
"branch-alias": {
"dev-master": "2.0-dev"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
2 changes: 1 addition & 1 deletion src/Admin/Content/StaticContentAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function getExportFormats()
*
* Documentation: https://symfony.com/doc/master/bundles/FOSCKEditorBundle/usage/config.html
*
* @param array $config configuration for CKEditorType
* @param array $config configuration for CKEditorType
*/
public function setCkEditorConfig(array $config)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/meta/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Symfony Cmf Sonata Phpcr Admin Integration Bundle
Symfony CMF Sonata Phpcr Admin Integration Bundle

The MIT License

Expand Down
3 changes: 2 additions & 1 deletion tests/Unit/Admin/Core/Extension/ChildExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@

namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Unit\Admin\Core\Extension;

use PHPUnit\Framework\TestCase;
use Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Core\Extension\ChildExtension;

class ChildExtensionTest extends \PHPUnit_Framework_TestCase
class ChildExtensionTest extends TestCase
{
public function testAlterNewInstance()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Unit\DependencyInjection\Factory;

use PHPUnit\Framework\TestCase;
use Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\DependencyInjection\Factory\ContentAdminFactory;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\Processor;
Expand All @@ -21,7 +22,7 @@
* @author Wouter de Jong <[email protected]>
* @author Maximilian Berghoff <[email protected]>
*/
class ContentAdminFactoryTest extends \PHPUnit_Framework_TestCase
class ContentAdminFactoryTest extends TestCase
{
private $factory;

Expand Down
5 changes: 3 additions & 2 deletions tests/Unit/Description/SonataEnhancerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/

namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Unit\Enhancer\ResourceDescription;
namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Unit\Description;

use PHPUnit\Framework\TestCase;
use Prophecy\Argument;
use Sonata\AdminBundle\Admin\AbstractAdmin;
use Sonata\AdminBundle\Admin\Pool;
Expand All @@ -24,7 +25,7 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;

class SonataEnhancerTest extends \PHPUnit_Framework_TestCAse
class SonataEnhancerTest extends TestCase
{
private $admin;

Expand Down
1 change: 1 addition & 0 deletions travis.php.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
memory_limit = -1