Skip to content

Commit c4f99b0

Browse files
authored
Support Symfony 5 for 1.x (#1)
1 parent e0daee6 commit c4f99b0

176 files changed

Lines changed: 1835 additions & 2322 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coveralls.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
.php_cs.cache
1+
.php-cs-fixer.cache
22
composer.lock
33
phpunit.xml
44
vendor/*
55
build/
6+
.phpunit.result.cache

.php-cs-fixer.dist.php

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->in(__DIR__)
5+
->ignoreDotFiles(true)
6+
->ignoreVCS(true)
7+
->exclude(array('build', 'vendor'))
8+
->files()
9+
->name('*.php')
10+
;
11+
12+
return (new PhpCsFixer\Config())
13+
->setFinder($finder)
14+
->setRules([
15+
'@Symfony' => true,
16+
'@Symfony:risky' => false,
17+
'array_syntax' => ['syntax' => 'short'],
18+
'cast_spaces' => ['space' => 'single'],
19+
'fopen_flags' => false,
20+
'fully_qualified_strict_types' => true,
21+
'global_namespace_import' => true,
22+
'list_syntax' => ['syntax' => 'short'],
23+
'ordered_imports' => true,
24+
'protected_to_private' => false,
25+
'phpdoc_align' => ['align' => 'vertical'],
26+
'phpdoc_line_span' => true,
27+
'phpdoc_summary' => false,
28+
'phpdoc_to_comment' => false,
29+
'class_definition' => ['multi_line_extends_each_single_line' => true],
30+
])
31+
;

.php_cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ unprecedented simplicity.
99
# ⚠️
1010
# This is the 1.x branch of EasyAdmin, which is NO LONGER MAINTAINED.
1111
# EasyAdmin 1.x should only be used in legacy projects that can't be upgraded to newer EasyAdmin versions.
12+

composer.json

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,66 +12,54 @@
1212
}
1313
],
1414
"require": {
15-
"php": ">=5.3.0",
16-
"doctrine/cache": "~1.5",
15+
"php": ">=7.4.0",
1716
"doctrine/dbal": "~2.3",
18-
"doctrine/doctrine-bundle": "~1.2",
19-
"doctrine/orm": "~2.3",
17+
"doctrine/doctrine-bundle": "~2.4",
18+
"doctrine/orm": "~2.7",
2019
"pagerfanta/pagerfanta": "~1.0,>=1.0.1|~2.0",
2120
"psr/log": "^1.0",
22-
"symfony/asset": "~2.3|~3.0|^4.0",
23-
"symfony/config": "~2.3|~3.0|^4.0",
24-
"symfony/dependency-injection": "~2.3|~3.0|^4.0",
25-
"symfony/doctrine-bridge": "~2.3|~3.0|^4.0",
26-
"symfony/event-dispatcher": "~2.3|~3.0|^4.0",
27-
"symfony/finder": "~2.3|~3.0|^4.0",
28-
"symfony/form": "~2.3|~3.0|^4.0",
29-
"symfony/framework-bundle": "~2.3|~3.0|^4.0",
30-
"symfony/http-foundation": "~2.3|~3.0|^4.0",
31-
"symfony/http-kernel": "~2.3|~3.0|^4.0",
21+
"symfony/asset": "^4.0|^5.0",
22+
"symfony/config": "^4.0|^5.0",
23+
"symfony/dependency-injection": "^4.0|^5.0",
24+
"symfony/doctrine-bridge": "^4.0|^5.0",
25+
"symfony/event-dispatcher": "^4.0|^5.0",
26+
"symfony/finder": "^4.0|^5.0",
27+
"symfony/form": "^4.0|^5.0",
28+
"symfony/framework-bundle": "^4.0|^5.0",
29+
"symfony/http-foundation": "^4.0|^5.0",
30+
"symfony/http-kernel": "^4.0|^5.0",
3231
"symfony/polyfill-mbstring": "^1.0",
33-
"symfony/property-access": "~2.3|~3.0|^4.0",
34-
"symfony/routing": "~2.3|~3.0|^4.0",
35-
"symfony/security-bundle": "~2.3|~3.0|^4.0",
36-
"symfony/translation": "~2.3|~3.0|^4.0",
37-
"symfony/twig-bridge": "^2.3.4|~3.0|^4.0",
38-
"symfony/twig-bundle": "~2.3|~3.0|^4.0",
39-
"symfony/validator": "~2.3|~3.0|^4.0",
40-
"twig/extensions": "~1.0",
41-
"twig/twig": "~1.42|~2.11"
32+
"symfony/property-access": "^4.0|^5.0",
33+
"symfony/routing": "^4.0|^5.0",
34+
"symfony/security-bundle": "^4.0|^5.0",
35+
"symfony/translation": "^4.0|^5.0",
36+
"symfony/twig-bridge": "^4.0|^5.0",
37+
"symfony/twig-bundle": "^4.0|^5.0",
38+
"symfony/validator": "^4.0|^5.0",
39+
"twig/twig": "^2.10|~3.3"
4240
},
4341
"require-dev": {
44-
"doctrine/doctrine-fixtures-bundle": "~2.2",
45-
"psr/log": "~1.0",
46-
"symfony/browser-kit": "~2.3|~3.0|^4.0",
47-
"symfony/console": "~2.3|~3.0|^4.0",
48-
"symfony/css-selector": "~2.3|~3.0|^4.0",
49-
"symfony/dom-crawler": "~2.3|~3.0|^4.0",
50-
"symfony/phpunit-bridge": "^3.2|^4.0",
51-
"symfony/var-dumper": "~2.3|~3.0|^4.0",
52-
"symfony/yaml": "~2.3|~3.0|^4.0"
53-
},
54-
"conflict": {
55-
"symfony/http-kernel": ">=5.0"
42+
"doctrine/doctrine-fixtures-bundle": "~3.4",
43+
"symfony/browser-kit": "^4.0|^5.0",
44+
"symfony/console": "^4.0|^5.0",
45+
"symfony/css-selector": "^4.0|^5.0",
46+
"symfony/dom-crawler": "^4.0|^5.0",
47+
"symfony/phpunit-bridge": "^3.2|^4.0|^5.0",
48+
"symfony/var-dumper": "^4.0|^5.0",
49+
"symfony/yaml": "^4.0|^5.0"
5650
},
5751
"config": {
5852
"sort-packages": true
5953
},
6054
"autoload": {
6155
"psr-4": {
62-
"EasyCorp\\Bundle\\EasyAdminBundle\\": "src/",
63-
"JavierEguiluz\\Bundle\\EasyAdminBundle\\": "legacy/"
56+
"EasyCorp\\Bundle\\EasyAdminBundle\\": "src/"
6457
}
6558
},
6659
"autoload-dev": {
6760
"psr-4": {
6861
"AppTestBundle\\": "tests/Fixtures/AppTestBundle/",
6962
"EasyCorp\\Bundle\\EasyAdminBundle\\Tests\\": "tests/"
7063
}
71-
},
72-
"extra": {
73-
"branch-alias": {
74-
"dev-master": "1.17.x-dev"
75-
}
7664
}
7765
}

legacy/Cache/CacheManager.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

legacy/Cache/ConfigWarmer.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

legacy/Configuration/ActionConfigPass.php

Lines changed: 0 additions & 13 deletions
This file was deleted.

legacy/Configuration/ConfigManager.php

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)