Skip to content

Commit 3d8cdd2

Browse files
phansysphansys
committed
Bump dependencies
1 parent 767a004 commit 3d8cdd2

32 files changed

+222
-279
lines changed

‎.php_cs.dist‎

Lines changed: 41 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -9,74 +9,48 @@ For the full copyright and license information, please view the LICENSE
99
file that was distributed with this source code.
1010
HEADER;
1111

12-
// Use PHP-CS-Fixer 2+ if it is available
13-
if (\class_exists(PhpCsFixer\Config::class, false)) {
14-
return PhpCsFixer\Config::create()
15-
->setUsingCache(true)
16-
->setRiskyAllowed(true)
17-
->setRules([
18-
'@PHP56Migration' => true,
19-
'@PHP56Migration:risky' => true,
20-
'@PHPUnit57Migration:risky' => true,
21-
'@Symfony' => true,
22-
'@Symfony:risky' => true,
23-
'array_syntax' => ['syntax' => 'short'],
24-
'blank_line_after_opening_tag' => true,
25-
'combine_consecutive_issets' => true,
26-
'combine_consecutive_unsets' => true,
27-
'explicit_string_variable' => true,
28-
'global_namespace_import' => ['import_classes' => false],
29-
'header_comment' => [
30-
'header' => $header,
31-
],
32-
'logical_operators' => true,
33-
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
34-
'multiline_whitespace_before_semicolons' => true,
35-
'no_alternative_syntax' => true,
36-
'no_extra_blank_lines' => true,
37-
'no_null_property_initialization' => true,
38-
'no_php4_constructor' => true,
39-
'no_short_echo_tag' => true,
40-
'no_superfluous_elseif' => true,
41-
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
42-
'no_unset_on_property' => true,
43-
'no_useless_else' => true,
44-
'no_useless_return' => true,
45-
'ordered_class_elements' => true,
46-
'ordered_imports' => true,
47-
'php_unit_construct' => true,
48-
'php_unit_set_up_tear_down_visibility' => true,
49-
'php_unit_strict' => true,
50-
'phpdoc_order' => true,
51-
'single_line_throw' => false,
52-
'static_lambda' => true,
53-
'strict_param' => true,
54-
])
55-
->setFinder(
56-
PhpCsFixer\Finder::create()->exclude(['Tests/Functional/cache'])->in(__DIR__)
57-
)
58-
;
59-
}
60-
61-
return Symfony\CS\Config\Config::create()
12+
return PhpCsFixer\Config::create()
6213
->setUsingCache(true)
63-
->fixers([
64-
'combine_consecutive_unsets',
65-
'ereg_to_preg',
66-
'header_comment' => $header,
67-
'newline_after_open_tag',
68-
'ordered_use',
69-
'php_unit_construct',
70-
'php_unit_dedicate_assert',
71-
'php_unit_strict',
72-
'phpdoc_order',
73-
'short_array_syntax',
74-
'short_echo_tag',
75-
'strict_param',
14+
->setRiskyAllowed(true)
15+
->setRules([
16+
'@PHP56Migration' => true,
17+
'@PHP56Migration:risky' => true,
18+
'@PHPUnit57Migration:risky' => true,
19+
'@Symfony' => true,
20+
'@Symfony:risky' => true,
21+
'array_syntax' => ['syntax' => 'short'],
22+
'blank_line_after_opening_tag' => true,
23+
'combine_consecutive_issets' => true,
24+
'combine_consecutive_unsets' => true,
25+
'explicit_string_variable' => true,
26+
'global_namespace_import' => ['import_classes' => false],
27+
'header_comment' => [
28+
'header' => $header,
29+
],
30+
'logical_operators' => true,
31+
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
32+
'multiline_whitespace_before_semicolons' => true,
33+
'no_alternative_syntax' => true,
34+
'no_extra_blank_lines' => true,
35+
'no_null_property_initialization' => true,
36+
'no_php4_constructor' => true,
37+
'no_short_echo_tag' => true,
38+
'no_superfluous_elseif' => true,
39+
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
40+
'no_unset_on_property' => true,
41+
'no_useless_else' => true,
42+
'no_useless_return' => true,
43+
'ordered_class_elements' => true,
44+
'ordered_imports' => true,
45+
'php_unit_construct' => true,
46+
'php_unit_set_up_tear_down_visibility' => true,
47+
'php_unit_strict' => true,
48+
'phpdoc_order' => true,
49+
'single_line_throw' => false,
50+
'static_lambda' => true,
51+
'strict_param' => true,
7652
])
77-
->finder(
78-
Symfony\CS\Finder\DefaultFinder::create()
79-
->exclude(['Tests/Functional/cache'])
80-
->in(__DIR__)
53+
->setFinder(
54+
PhpCsFixer\Finder::create()->exclude(['Tests/Functional/cache'])->in(__DIR__)
8155
)
8256
;

‎.travis.yml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ language: php
22
warnings_are_errors: false
33

44
php:
5-
- 7.1
65
- 7.2
76
- 7.3
87
- 7.4
@@ -15,25 +14,21 @@ env:
1514
matrix:
1615
fast_finish: true
1716
include:
18-
- php: 5.6
19-
env: SYMFONY_PHPUNIT_VERSION="5.7.27"
20-
- php: 5.6
21-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
22-
- php: 5.6
23-
env: SYMFONY_VERSION="~2.8.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
24-
- php: 5.6
25-
env: SYMFONY_VERSION="~3.4.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
26-
- php: 5.6
27-
env: INSTALL_VICH_UPLOADER_BUNDLE=true SYMFONY_PHPUNIT_VERSION="5.7.27"
28-
- php: 7.0
29-
env: SYMFONY_PHPUNIT_VERSION="5.7.27"
17+
- php: 7.2
18+
- php: 7.2
19+
env: COMPOSER_FLAGS="--prefer-lowest"
20+
- php: 7.2
21+
env: SYMFONY_VERSION="^4.4.0"
22+
- php: 7.2
23+
env: INSTALL_VICH_UPLOADER_BUNDLE=true
24+
- php: 7.3
25+
- php: 7.4
3026
- php: 7.4
31-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
27+
env: COMPOSER_FLAGS="--prefer-lowest"
3228
- php: 7.4
3329
env: INSTALL_VICH_UPLOADER_BUNDLE=true
3430
allow_failures:
3531
- php: nightly
36-
- env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
3732

3833
sudo: false
3934

‎DependencyInjection/Compiler/DoctrineOrmMappingsPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Hackzilla\Bundle\TicketBundle\DependencyInjection\Compiler;
1313

14-
use Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator;
1514
use Doctrine\ORM\Mapping\Driver\XmlDriver;
15+
use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
1616
use Hackzilla\Bundle\TicketBundle\DependencyInjection\HackzillaTicketExtension;
1717
use Hackzilla\Bundle\TicketBundle\Entity\Ticket;
1818
use Hackzilla\Bundle\TicketBundle\Entity\TicketMessage;

‎Manager/TicketManager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Hackzilla\Bundle\TicketBundle\Manager;
1313

14-
use Doctrine\Common\Persistence\ObjectManager;
14+
use Doctrine\Persistence\ObjectManager;
1515
use Hackzilla\Bundle\TicketBundle\Entity\TicketMessage;
1616
use Hackzilla\Bundle\TicketBundle\Model\TicketInterface;
1717
use Hackzilla\Bundle\TicketBundle\Model\TicketMessageInterface;

‎Manager/TicketManagerInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Hackzilla\Bundle\TicketBundle\Manager;
1313

14-
use Doctrine\Common\Persistence\ObjectManager;
1514
use Doctrine\ORM\QueryBuilder;
15+
use Doctrine\Persistence\ObjectManager;
1616
use Hackzilla\Bundle\TicketBundle\Model\TicketInterface;
1717
use Hackzilla\Bundle\TicketBundle\Model\TicketMessageInterface;
1818
use Symfony\Component\Translation\TranslatorInterface;

‎Manager/UserManager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Hackzilla\Bundle\TicketBundle\Manager;
1313

14-
use Doctrine\Common\Persistence\ObjectRepository;
14+
use Doctrine\Persistence\ObjectRepository;
1515
use Hackzilla\Bundle\TicketBundle\Model\TicketInterface;
1616
use Hackzilla\Bundle\TicketBundle\Model\UserInterface;
1717
use Hackzilla\Bundle\TicketBundle\TicketRole;

‎README.md‎

Lines changed: 35 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
# Hackzilla Ticket Bundle
22

33
Simple ticketing bundle for any project.
4-
Available translations for:
5-
6-
* Dutch
7-
* English
8-
* French
9-
* German
10-
* Italian
11-
* Portuguese
12-
* Russian
13-
* Spanish
144

155
[![Build Status](https://travis-ci.org/hackzilla/TicketBundle.png?branch=master)](https://travis-ci.org/hackzilla/TicketBundle)
166
[![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:
199

2010
## Requirements
2111

22-
* PHP ^5.6\|^7.0
23-
* [Symfony][1] ^2.8|^3.4|^4.0
24-
* [Knp Paginator bundle][2]
25-
26-
## Optional Requirements
27-
28-
* [FOSUserBundle][5]
29-
* [Bootstrap v3][3] (see [http://symfony.com/blog/new-in-symfony-2-6-bootstrap-form-theme][4])
30-
31-
## Version Matrix
32-
33-
| Ticket Bundle | Symfony | PHP |
34-
| --------------| ---------------- | ---------- |
35-
| [3.x][6] | ^2.8\|^3.4\|^4.0 | ^5.6\|^7.0 |
36-
| [2.x][7] | ^2.7\|^3.4 | ^5.3\|^7.0 |
37-
| [1.x][8] | ^2.3 | ^5.3\|^7.0 |
38-
| [0.x][9] | ^2.3 | ^5.3\|^7.0 |
39-
40-
## Demo
41-
42-
See [Ticket Bundle Demo App][10] for an example installation. This can also be used for confirming bugs.
12+
You can see the full requirement definitions for each available version in [Packagist](https://packagist.org/packages/hackzilla/ticket-bundle).
4313

4414
## Setup
4515

46-
* [Installation with FOSUserBundle][11]
47-
* [Generic Installation][12]
16+
* [Installation with FOSUserBundle](Resources/doc/setup/fosuserbundle.md)
17+
* [Generic installation](Resources/doc/setup/other.md)
4818

49-
## Optional Features
19+
## Optional features
5020

5121
These optional features that can be turned on or off.
5222

5323
### Features
5424

55-
* [Attachments][13]
56-
* [Custom Entities][14]
57-
* [Events][15]
25+
* [Attachments](Resources/doc/setup/feature/attachments.md)
26+
* [Custom entities](Resources/doc/setup/feature/custom-entities.md)
27+
* [Events](Resources/doc/setup/feature/events.md)
5828

59-
## 3rd Party Extensions
29+
## Optional integrations
6030

61-
### [Email Notification][16]
31+
* [FOSUserBundle](https://symfony.com/doc/current/bundles/FOSUserBundle/index.html)
32+
* [Bootstrap v3](http://getbootstrap.com/docs/3.3/) (see http://symfony.com/blog/new-in-symfony-2-6-bootstrap-form-theme)
6233

63-
### Custom Templates (Optional)
34+
## 3rd party extensions
35+
36+
### [Email notifications](https://github.com/flodaq/TicketNotificationBundle)
37+
38+
### Custom templates (optional)
6439

6540
```yaml
66-
# config.yml
41+
# config/packages/hackzilla_ticket.yaml
6742

6843
hackzilla_ticket:
6944
templates:
@@ -74,29 +49,27 @@ hackzilla_ticket:
7449
show_attachment: '@App/Ticket/show_attachment.html.twig'
7550
```
7651
77-
## Migrate a Previous Version
52+
## Translations
53+
54+
Built in translations are available for the following languages:
55+
56+
* Dutch
57+
* English
58+
* French
59+
* German
60+
* Italian
61+
* Portuguese
62+
* Russian
63+
* Spanish
64+
65+
## Demo
66+
67+
See [Ticket Bundle Demo App](https://github.com/hackzilla/TicketBundleDemoApp) for an example installation. This can also be used for confirming bugs.
7868
79-
* [How to migrate][17]
69+
## Migrate a previous version
8070
71+
* [How to migrate](Resources/doc/migrate/index.md)
8172
82-
## Pull Requests
73+
## Pull requests
8374
8475
I'm open to pull requests for additional languages, features and/or improvements.
85-
86-
[1]: https://symfony.com/
87-
[2]: https://github.com/KnpLabs/KnpPaginatorBundle
88-
[3]: http://getbootstrap.com/docs/3.3/
89-
[4]: http://symfony.com/blog/new-in-symfony-2-6-bootstrap-form-theme
90-
[5]: https://symfony.com/doc/current/bundles/FOSUserBundle/index.html
91-
[6]: https://github.com/hackzilla/TicketBundle/tree/3.x
92-
[7]: https://github.com/hackzilla/TicketBundle/tree/2.x
93-
[8]: https://github.com/hackzilla/TicketBundle/tree/1.x
94-
[9]: https://github.com/hackzilla/TicketBundle/tree/0.9.x
95-
[10]: https://github.com/hackzilla/TicketBundleDemoApp
96-
[11]: Resources/doc/setup/fosuserbundle.md
97-
[12]: Resources/doc/setup/other.md
98-
[13]: Resources/doc/setup/feature/attachments.md
99-
[14]: Resources/doc/setup/feature/custom-entities.md
100-
[15]: Resources/doc/setup/feature/events.md
101-
[16]: https://github.com/flodaq/TicketNotificationBundle
102-
[17]: Resources/doc/migrate/index.md

‎Resources/doc/migrate/v1-to-v2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Add your user class into your config.
44

55
```yaml
66
hackzilla_ticket:
7-
user_class: AppBundle\Entity\User
7+
user_class: App\Entity\User
88
```
99
1010
```Hackzilla\Bundle\TicketBundle\User\UserInterface``` has been replaced with ```Hackzilla\Bundle\TicketBundle\Manager\UserManagerInterface```

0 commit comments

Comments
 (0)