Bump dependencies

hackzilla-project · Oct 27, 2020 · 3d8cdd2 · 3d8cdd2
1 parent 767a004
commit 3d8cdd2
Show file tree

Hide file tree

Showing 32 changed files with 222 additions and 279 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -9,74 +9,48 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 HEADER;
 
-// Use PHP-CS-Fixer 2+ if it is available
-if (\class_exists(PhpCsFixer\Config::class, false)) {
-    return PhpCsFixer\Config::create()
-        ->setUsingCache(true)
-        ->setRiskyAllowed(true)
-        ->setRules([
-            '@PHP56Migration' => true,
-            '@PHP56Migration:risky' => true,
-            '@PHPUnit57Migration:risky' => true,
-            '@Symfony' => true,
-            '@Symfony:risky' => true,
-            'array_syntax' => ['syntax' => 'short'],
-            'blank_line_after_opening_tag' => true,
-            'combine_consecutive_issets' => true,
-            'combine_consecutive_unsets' => true,
-            'explicit_string_variable' => true,
-            'global_namespace_import' => ['import_classes' => false],
-            'header_comment' => [
-                'header' => $header,
-            ],
-            'logical_operators' => true,
-            'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
-            'multiline_whitespace_before_semicolons' => true,
-            'no_alternative_syntax' => true,
-            'no_extra_blank_lines' => true,
-            'no_null_property_initialization' => true,
-            'no_php4_constructor' => true,
-            'no_short_echo_tag' => true,
-            'no_superfluous_elseif' => true,
-            'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
-            'no_unset_on_property' => true,
-            'no_useless_else' => true,
-            'no_useless_return' => true,
-            'ordered_class_elements' => true,
-            'ordered_imports' => true,
-            'php_unit_construct' => true,
-            'php_unit_set_up_tear_down_visibility' => true,
-            'php_unit_strict' => true,
-            'phpdoc_order' => true,
-            'single_line_throw' => false,
-            'static_lambda' => true,
-            'strict_param' => true,
-        ])
-        ->setFinder(
-            PhpCsFixer\Finder::create()->exclude(['Tests/Functional/cache'])->in(__DIR__)
-        )
-    ;
-}
-
-return Symfony\CS\Config\Config::create()
+return PhpCsFixer\Config::create()
     ->setUsingCache(true)
-    ->fixers([
-        'combine_consecutive_unsets',
-        'ereg_to_preg',
-        'header_comment' => $header,
-        'newline_after_open_tag',
-        'ordered_use',
-        'php_unit_construct',
-        'php_unit_dedicate_assert',
-        'php_unit_strict',
-        'phpdoc_order',
-        'short_array_syntax',
-        'short_echo_tag',
-        'strict_param',
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PHP56Migration' => true,
+        '@PHP56Migration:risky' => true,
+        '@PHPUnit57Migration:risky' => true,
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_after_opening_tag' => true,
+        'combine_consecutive_issets' => true,
+        'combine_consecutive_unsets' => true,
+        'explicit_string_variable' => true,
+        'global_namespace_import' => ['import_classes' => false],
+        'header_comment' => [
+            'header' => $header,
+        ],
+        'logical_operators' => true,
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'multiline_whitespace_before_semicolons' => true,
+        'no_alternative_syntax' => true,
+        'no_extra_blank_lines' => true,
+        'no_null_property_initialization' => true,
+        'no_php4_constructor' => true,
+        'no_short_echo_tag' => true,
+        'no_superfluous_elseif' => true,
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+        'no_unset_on_property' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => true,
+        'php_unit_set_up_tear_down_visibility' => true,
+        'php_unit_strict' => true,
+        'phpdoc_order' => true,
+        'single_line_throw' => false,
+        'static_lambda' => true,
+        'strict_param' => true,
     ])
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
-            ->exclude(['Tests/Functional/cache'])
-            ->in(__DIR__)
+    ->setFinder(
+        PhpCsFixer\Finder::create()->exclude(['Tests/Functional/cache'])->in(__DIR__)
     )
 ;
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: php
 warnings_are_errors: false
 
 php:
-  - 7.1
   - 7.2
   - 7.3
   - 7.4
@@ -15,25 +14,21 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
-      env: SYMFONY_PHPUNIT_VERSION="5.7.27"
-    - php: 5.6
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
-    - php: 5.6
-      env: SYMFONY_VERSION="~2.8.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
-    - php: 5.6
-      env: SYMFONY_VERSION="~3.4.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
-    - php: 5.6
-      env: INSTALL_VICH_UPLOADER_BUNDLE=true SYMFONY_PHPUNIT_VERSION="5.7.27"
-    - php: 7.0
-      env: SYMFONY_PHPUNIT_VERSION="5.7.27"
+    - php: 7.2
+    - php: 7.2
+      env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 7.2
+      env: SYMFONY_VERSION="^4.4.0"
+    - php: 7.2
+      env: INSTALL_VICH_UPLOADER_BUNDLE=true
+    - php: 7.3
+    - php: 7.4
     - php: 7.4
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
+      env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 7.4
       env: INSTALL_VICH_UPLOADER_BUNDLE=true
   allow_failures:
     - php: nightly
-    - env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
 
 sudo: false
 

diff --git a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
@@ -11,8 +11,8 @@
 
 namespace Hackzilla\Bundle\TicketBundle\DependencyInjection\Compiler;
 
-use Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
+use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
 use Hackzilla\Bundle\TicketBundle\DependencyInjection\HackzillaTicketExtension;
 use Hackzilla\Bundle\TicketBundle\Entity\Ticket;
 use Hackzilla\Bundle\TicketBundle\Entity\TicketMessage;

diff --git a/Manager/TicketManager.php b/Manager/TicketManager.php
@@ -11,7 +11,7 @@
 
 namespace Hackzilla\Bundle\TicketBundle\Manager;
 
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Hackzilla\Bundle\TicketBundle\Entity\TicketMessage;
 use Hackzilla\Bundle\TicketBundle\Model\TicketInterface;
 use Hackzilla\Bundle\TicketBundle\Model\TicketMessageInterface;

diff --git a/Manager/TicketManagerInterface.php b/Manager/TicketManagerInterface.php
@@ -11,8 +11,8 @@
 
 namespace Hackzilla\Bundle\TicketBundle\Manager;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectManager;
 use Hackzilla\Bundle\TicketBundle\Model\TicketInterface;
 use Hackzilla\Bundle\TicketBundle\Model\TicketMessageInterface;
 use Symfony\Component\Translation\TranslatorInterface;

diff --git a/Manager/UserManager.php b/Manager/UserManager.php
@@ -11,7 +11,7 @@
 
 namespace Hackzilla\Bundle\TicketBundle\Manager;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use Hackzilla\Bundle\TicketBundle\Model\TicketInterface;
 use Hackzilla\Bundle\TicketBundle\Model\UserInterface;
 use Hackzilla\Bundle\TicketBundle\TicketRole;

diff --git a/README.md b/README.md
@@ -1,16 +1,6 @@
 # Hackzilla Ticket Bundle
 
 Simple ticketing bundle for any project.
-Available translations for:
-
-* Dutch
-* English
-* French
-* German
-* Italian
-* Portuguese
-* Russian
-* Spanish
 
 [![Build Status](https://travis-ci.org/hackzilla/TicketBundle.png?branch=master)](https://travis-ci.org/hackzilla/TicketBundle)
 [![Quality assurance](https://github.com/hackzilla/TicketBundle/workflows/Quality%20assurance/badge.svg)](https://github.com/hackzilla/TicketBundle/actions?query=workflow%3A%22Quality+assurance%22)
@@ -19,51 +9,36 @@ Available translations for:
 
 ## Requirements
 
-* PHP ^5.6\|^7.0
-* [Symfony][1] ^2.8|^3.4|^4.0
-* [Knp Paginator bundle][2]
-
-## Optional Requirements
-
-* [FOSUserBundle][5]
-* [Bootstrap v3][3] (see [http://symfony.com/blog/new-in-symfony-2-6-bootstrap-form-theme][4])
-
-## Version Matrix
-
-| Ticket Bundle | Symfony          | PHP        |
-| --------------| ---------------- | ---------- |
-| [3.x][6]      | ^2.8\|^3.4\|^4.0 | ^5.6\|^7.0 |
-| [2.x][7]      | ^2.7\|^3.4       | ^5.3\|^7.0 |
-| [1.x][8]      | ^2.3             | ^5.3\|^7.0 |
-| [0.x][9]      | ^2.3             | ^5.3\|^7.0 |
-
-## Demo
-
-See [Ticket Bundle Demo App][10] for an example installation. This can also be used for confirming bugs.
+You can see the full requirement definitions for each available version in [Packagist](https://packagist.org/packages/hackzilla/ticket-bundle).
 
 ## Setup
 
-* [Installation with FOSUserBundle][11]
-* [Generic Installation][12]
+* [Installation with FOSUserBundle](Resources/doc/setup/fosuserbundle.md)
+* [Generic installation](Resources/doc/setup/other.md)
 
-## Optional Features
+## Optional features
 
 These optional features that can be turned on or off.
 
 ### Features
 
-* [Attachments][13]
-* [Custom Entities][14]
-* [Events][15]
+* [Attachments](Resources/doc/setup/feature/attachments.md)
+* [Custom entities](Resources/doc/setup/feature/custom-entities.md)
+* [Events](Resources/doc/setup/feature/events.md)
 
-## 3rd Party Extensions
+## Optional integrations
 
-### [Email Notification][16]
+* [FOSUserBundle](https://symfony.com/doc/current/bundles/FOSUserBundle/index.html)
+* [Bootstrap v3](http://getbootstrap.com/docs/3.3/) (see http://symfony.com/blog/new-in-symfony-2-6-bootstrap-form-theme)
 
-### Custom Templates (Optional)
+## 3rd party extensions
+
+### [Email notifications](https://github.com/flodaq/TicketNotificationBundle)
+
+### Custom templates (optional)
 
 ```yaml
-# config.yml
+# config/packages/hackzilla_ticket.yaml
 
 hackzilla_ticket:
     templates:
@@ -74,29 +49,27 @@ hackzilla_ticket:
         show_attachment: '@App/Ticket/show_attachment.html.twig'
 ```
 
-## Migrate a Previous Version
+## Translations
+
+Built in translations are available for the following languages:
+
+* Dutch
+* English
+* French
+* German
+* Italian
+* Portuguese
+* Russian
+* Spanish
+
+## Demo
+
+See [Ticket Bundle Demo App](https://github.com/hackzilla/TicketBundleDemoApp) for an example installation. This can also be used for confirming bugs.
 
-* [How to migrate][17]
+## Migrate a previous version
 
+* [How to migrate](Resources/doc/migrate/index.md)
 
-## Pull Requests
+## Pull requests
 
 I'm open to pull requests for additional languages, features and/or improvements.
-
-[1]: https://symfony.com/
-[2]: https://github.com/KnpLabs/KnpPaginatorBundle
-[3]: http://getbootstrap.com/docs/3.3/
-[4]: http://symfony.com/blog/new-in-symfony-2-6-bootstrap-form-theme
-[5]: https://symfony.com/doc/current/bundles/FOSUserBundle/index.html
-[6]: https://github.com/hackzilla/TicketBundle/tree/3.x
-[7]: https://github.com/hackzilla/TicketBundle/tree/2.x
-[8]: https://github.com/hackzilla/TicketBundle/tree/1.x
-[9]: https://github.com/hackzilla/TicketBundle/tree/0.9.x
-[10]: https://github.com/hackzilla/TicketBundleDemoApp
-[11]: Resources/doc/setup/fosuserbundle.md
-[12]: Resources/doc/setup/other.md
-[13]: Resources/doc/setup/feature/attachments.md
-[14]: Resources/doc/setup/feature/custom-entities.md
-[15]: Resources/doc/setup/feature/events.md
-[16]: https://github.com/flodaq/TicketNotificationBundle
-[17]: Resources/doc/migrate/index.md
diff --git a/Resources/doc/migrate/v1-to-v2.md b/Resources/doc/migrate/v1-to-v2.md
@@ -4,7 +4,7 @@ Add your user class into your config.
 
 ```yaml
 hackzilla_ticket:
-    user_class: AppBundle\Entity\User
+    user_class: App\Entity\User
 ```
 
 ```Hackzilla\Bundle\TicketBundle\User\UserInterface``` has been replaced with ```Hackzilla\Bundle\TicketBundle\Manager\UserManagerInterface```