Merge pull request #19 from northernco/symfony-6-update

Symfony 6 update

.travis.yml

@@ -0,0 +1,44 @@
+language: php
+
+php:
+    - 8.0
+    - 8.1
+    - 8.2
+
+matrix:
+    include:
+        -   php: 8.0
+            env: SYMFONY_VERSION=^5.2
+        -   php: 8.1
+            env: SYMFONY_VERSION=^5.2
+        -   php: 8.2
+            env: SYMFONY_VERSION=^5.2
+
+before_install:
+    - echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+    - |
+        if [ "${SYMFONY_VERSION}" != "" ]; then
+            packages="form dependency-injection config http-foundation http-kernel options-resolver security-guard serializer"
+            devpackages="framework-bundle browser-kit templating expression-language"
+            for package in $packages
+                do
+                    composer require --no-update symfony/"$package"=${SYMFONY_VERSION};
+                done
+            for package in $devpackages
+                do
+                    composer require --dev --no-update symfony/"$package"=${SYMFONY_VERSION};
+                done
+        fi;
+
+install:
+    - travis_retry composer self-update
+    - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
+    - curl -s http://getcomposer.org/installer | php
+    - php composer.phar install --dev --no-interaction
+
+script:
+    - mkdir -p build/logs
+    - php vendor/bin/phpunit -c phpunit.xml.dist
+
+after_success:
+    - php vendor/bin/php-coveralls

composer.json

@@ -7,30 +7,31 @@
     "license": "MIT",
     "require": {
         "php": ">=8.0",
-        "symfony/form": "^4.4|^5.2",
-        "symfony/dependency-injection": "^4.4|^5.2",
-        "symfony/config": "^4.4|^5.2",
-        "symfony/http-foundation": "^4.4|^5.2",
-        "symfony/http-kernel": "^4.4|^5.2",
-        "symfony/options-resolver": "^4.4|^5.2",
-        "symfony/security-core": "^4.4|^5.2",
-        "symfony/serializer": "^4.4|^5.2",
-        "twig/twig": "^2.4|^3.0"
+        "symfony/form": "^5.2|^6.2",
+        "symfony/dependency-injection": "^5.2|^6.2",
+        "symfony/config": "^5.2|^6.2",
+        "symfony/http-foundation": "^5.2|^6.2",
+        "symfony/http-kernel": "^5.2|^6.2",
+        "symfony/options-resolver": "^5.2|^6.2",
+        "symfony/security-core": "^5.2|^6.2",
+        "symfony/serializer": "^5.2|^6.2",
+        "twig/twig": "^2.4|^3.0",
+        "symfony/translation": "^5.2|^6.2",
+        "doctrine/annotations": "^1.14|^2.0",
+        "doctrine/orm": "^2.13"
     },
     "require-dev": {
         "ext-intl": "*",
         "dg/bypass-finals": "^1.2",
-        "symfony/framework-bundle": "^4.4|^5.2",
-        "symfony/expression-language": "^4.4|^5.2",
-        "symfony/phpunit-bridge": "^4.4|^5.2",
-        "phpunit/phpunit": "^9.5",
-        "doctrine/orm": "~2.4,>=2.4.5"
+        "symfony/framework-bundle": "^5.2|^6.2",
+        "symfony/expression-language": "^5.2|^6.2",
+        "symfony/phpunit-bridge": "^5.2|^6.2",
+        "phpunit/phpunit": "^9.5"
     },
     "suggest": {
         "ext-intl": "Translate the grid",
         "ext-mbstring": "Convert your data with the right charset",
-        "PHPExcel": "Export the grid (Excel, HTML or PDF)",
-        "doctrine/orm": "If you want to use Entity as source, please require doctrine/orm"
+        "PHPExcel": "Export the grid (Excel, HTML or PDF)"
     },
     "autoload": {
         "psr-4": {

src/APYDataGridBundle.php

@@ -19,7 +19,7 @@
 
 class APYDataGridBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 

src/DependencyInjection/APYDataGridExtension.php

@@ -20,7 +20,7 @@
 
 class APYDataGridExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);

src/DependencyInjection/Compiler/GridExtensionPass.php

@@ -18,7 +18,7 @@
 
 class GridExtensionPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (false === $container->hasDefinition('grid')) {
             return;

src/DependencyInjection/Compiler/GridPass.php

@@ -20,7 +20,7 @@ class GridPass implements CompilerPassInterface
      *
      * @api
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('apy_grid.registry')) {
             return;

src/DependencyInjection/Compiler/TranslationPass.php

@@ -16,7 +16,7 @@ class TranslationPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('jms_translation.extractor.file_extractor')) {
             return;

src/DependencyInjection/Configuration.php

@@ -15,7 +15,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('apy_data_grid');
         $rootNode = $treeBuilder->getRootNode();

src/Grid/AbstractType.php

@@ -14,19 +14,19 @@ abstract class AbstractType implements GridTypeInterface
     /**
      * {@inheritdoc}
      */
-    public function buildGrid(GridBuilder $builder, array $options = [])
+    public function buildGrid(GridBuilder $builder, array $options = []): void
     {
     }
 
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
     }
 
     /**
      * {@inheritdoc}
      */
-    abstract public function getName();
+    abstract public function getName(): string;
 }

src/Grid/Action/DeleteMassAction.php

@@ -14,12 +14,7 @@
 
 class DeleteMassAction extends MassAction
 {
-    /**
-     * Default DeleteMassAction constructor.
-     *
-     * @param bool $confirm Show confirm message if true
-     */
-    public function __construct($confirm = false)
+    public function __construct(bool $confirm = false)
     {
         parent::__construct('Delete', 'static::deleteAction', $confirm);
     }