Skip to content

Commit df7866b

Browse files
weaverryanweaverryan
committed
Compiling upgrades for PHP 8 compatiblity. Everything except for StofDoctrineExtensionsBundle, which needs a new tag. The big headaches were sentry, which required major upgrades and some new nyholm libraries. doctrine/persistence and doctrine/common also went up a major version. For the Doctrine tutorial, the minimum version increased to 7.4 due to various reasons related to proxy-manager.
1 parent 38a246c commit df7866b

28 files changed

+5626
-4780
lines changed

‎_tuts/ago-install-knptimebundle.diff

Lines changed: 402 additions & 90 deletions
Large diffs are not rendered by default.

‎_tuts/assets-install-asset.diff

Lines changed: 103 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/composer.json b/composer.json
2-
index c62bc552..385255ab 100644
2+
index 03e63953..ecb84d8d 100644
33
--- a/composer.json
44
+++ b/composer.json
55
@@ -7,6 +7,7 @@
@@ -11,38 +11,100 @@ index c62bc552..385255ab 100644
1111
"symfony/debug-bundle": "5.0.*",
1212
"symfony/dotenv": "5.0.*",
1313
diff --git a/composer.lock b/composer.lock
14-
index 6a80d9e6..4ba36928 100644
14+
index d2aa6634..556c2e70 100644
1515
--- a/composer.lock
1616
+++ b/composer.lock
1717
@@ -4,7 +4,7 @@
1818
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
1919
"This file is @generated automatically"
2020
],
21-
- "content-hash": "d454c5a3afb3eb11d12ec6603deb3b03",
22-
+ "content-hash": "bdf0c0c8f8e500b9a0762d57ae90105d",
21+
- "content-hash": "67b9ad70765902395a07c329b1d2fada",
22+
+ "content-hash": "110dfb058b9867d7df48982b0ced8003",
2323
"packages": [
2424
{
2525
"name": "doctrine/annotations",
26-
@@ -533,6 +533,62 @@
26+
@@ -156,6 +156,61 @@
2727
],
28+
"time": "2020-05-25T17:44:05+00:00"
29+
},
30+
+ {
31+
+ "name": "easycorp/easy-log-handler",
32+
+ "version": "v1.0.9",
33+
+ "source": {
34+
+ "type": "git",
35+
+ "url": "https://github.com/EasyCorp/easy-log-handler.git",
36+
+ "reference": "224e1dfcf9455aceee89cd0af306ac097167fac1"
37+
+ },
38+
+ "dist": {
39+
+ "type": "zip",
40+
+ "url": "https://api.github.com/repos/EasyCorp/easy-log-handler/zipball/224e1dfcf9455aceee89cd0af306ac097167fac1",
41+
+ "reference": "224e1dfcf9455aceee89cd0af306ac097167fac1",
42+
+ "shasum": ""
43+
+ },
44+
+ "require": {
45+
+ "monolog/monolog": "~1.6|~2.0",
46+
+ "php": ">=7.1",
47+
+ "symfony/yaml": "^3.4|^4.0|^5.0"
48+
+ },
49+
+ "type": "library",
50+
+ "autoload": {
51+
+ "psr-4": {
52+
+ "EasyCorp\\EasyLog\\": "src"
53+
+ }
54+
+ },
55+
+ "notification-url": "https://packagist.org/downloads/",
56+
+ "license": [
57+
+ "MIT"
58+
+ ],
59+
+ "authors": [
60+
+ {
61+
+ "name": "Javier Eguiluz",
62+
+ "email": "javiereguiluz@gmail.com"
63+
+ },
64+
+ {
65+
+ "name": "Project Contributors",
66+
+ "homepage": "https://github.com/EasyCorp/easy-log-handler"
67+
+ }
68+
+ ],
69+
+ "description": "A handler for Monolog that optimizes log messages to be processed by humans instead of software. Improve your productivity with logs that are easy to understand.",
70+
+ "homepage": "https://github.com/EasyCorp/easy-log-handler",
71+
+ "keywords": [
72+
+ "easy",
73+
+ "log",
74+
+ "logging",
75+
+ "monolog",
76+
+ "productivity"
77+
+ ],
78+
+ "support": {
79+
+ "issues": "https://github.com/EasyCorp/easy-log-handler/issues",
80+
+ "source": "https://github.com/EasyCorp/easy-log-handler/tree/master"
81+
+ },
82+
+ "abandoned": true,
83+
+ "time": "2019-10-24T07:13:31+00:00"
84+
+ },
85+
{
86+
"name": "monolog/monolog",
87+
"version": "2.2.0",
88+
@@ -536,6 +591,79 @@
89+
},
2890
"time": "2019-12-27T08:57:19+00:00"
2991
},
3092
+ {
3193
+ "name": "symfony/asset",
32-
+ "version": "v5.0.5",
94+
+ "version": "v5.0.11",
3395
+ "source": {
3496
+ "type": "git",
3597
+ "url": "https://github.com/symfony/asset.git",
36-
+ "reference": "b9d7f8609849c71e79a0702fdaa453c1329b0c2c"
98+
+ "reference": "aaf4ba865c02f6df999166a0148d56f2b11b11fb"
3799
+ },
38100
+ "dist": {
39101
+ "type": "zip",
40-
+ "url": "https://api.github.com/repos/symfony/asset/zipball/b9d7f8609849c71e79a0702fdaa453c1329b0c2c",
41-
+ "reference": "b9d7f8609849c71e79a0702fdaa453c1329b0c2c",
102+
+ "url": "https://api.github.com/repos/symfony/asset/zipball/aaf4ba865c02f6df999166a0148d56f2b11b11fb",
103+
+ "reference": "aaf4ba865c02f6df999166a0148d56f2b11b11fb",
42104
+ "shasum": ""
43105
+ },
44106
+ "require": {
45-
+ "php": "^7.2.5"
107+
+ "php": ">=7.2.5"
46108
+ },
47109
+ "require-dev": {
48110
+ "symfony/http-foundation": "^4.4|^5.0",
@@ -81,16 +143,43 @@ index 6a80d9e6..4ba36928 100644
81143
+ ],
82144
+ "description": "Symfony Asset Component",
83145
+ "homepage": "https://symfony.com",
84-
+ "time": "2020-02-24T15:05:31+00:00"
146+
+ "support": {
147+
+ "source": "https://github.com/symfony/asset/tree/5.0"
148+
+ },
149+
+ "funding": [
150+
+ {
151+
+ "url": "https://symfony.com/sponsor",
152+
+ "type": "custom"
153+
+ },
154+
+ {
155+
+ "url": "https://github.com/fabpot",
156+
+ "type": "github"
157+
+ },
158+
+ {
159+
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
160+
+ "type": "tidelift"
161+
+ }
162+
+ ],
163+
+ "time": "2020-05-30T20:12:43+00:00"
85164
+ },
86165
{
87166
"name": "symfony/cache",
88-
"version": "v5.0.4",
167+
"version": "v5.0.11",
89168
diff --git a/symfony.lock b/symfony.lock
90-
index 6efc86de..99875e2b 100644
169+
index cc716d33..3504d78e 100644
91170
--- a/symfony.lock
92171
+++ b/symfony.lock
93-
@@ -56,6 +56,9 @@
172+
@@ -14,6 +14,9 @@
173+
"doctrine/lexer": {
174+
"version": "1.2.0"
175+
},
176+
+ "easycorp/easy-log-handler": {
177+
+ "version": "v1.0.9"
178+
+ },
179+
"monolog/monolog": {
180+
"version": "2.0.2"
181+
},
182+
@@ -44,6 +47,9 @@
94183
"config/packages/sensio_framework_extra.yaml"
95184
]
96185
},

‎_tuts/behaviors-install-stof-extensions.diff

Lines changed: 63 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
diff --git a/composer.json b/composer.json
2-
index dcfe6379..63a1d589 100644
2+
index 1557828c..f3d3e642 100644
33
--- a/composer.json
44
+++ b/composer.json
5-
@@ -13,6 +13,7 @@
6-
"knplabs/knp-time-bundle": "^1.11",
5+
@@ -14,6 +14,7 @@
6+
"nyholm/psr7": "^1.4",
77
"sensio/framework-extra-bundle": "^5.5",
8-
"sentry/sentry-symfony": "^3.4",
8+
"sentry/sentry-symfony": "^4.0",
99
+ "stof/doctrine-extensions-bundle": "^1.4",
1010
"symfony/asset": "5.1.*",
1111
"symfony/console": "5.1.*",
1212
"symfony/dotenv": "5.1.*",
1313
diff --git a/composer.lock b/composer.lock
14-
index 95d193cf..c4ebb8c9 100644
14+
index 159515f7..67eb1718 100644
1515
--- a/composer.lock
1616
+++ b/composer.lock
1717
@@ -4,8 +4,53 @@
1818
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
1919
"This file is @generated automatically"
2020
],
21-
- "content-hash": "ad56f76f17454d78d6ff64d5923a99c8",
22-
+ "content-hash": "9738ce84722919cbad11d5a9380d51a7",
21+
- "content-hash": "489e3415a79269ef94ab8059be436030",
22+
+ "content-hash": "495c09406b449e772275abac1a9ba54b",
2323
"packages": [
2424
+ {
2525
+ "name": "behat/transliterator",
@@ -68,40 +68,49 @@ index 95d193cf..c4ebb8c9 100644
6868
+ },
6969
{
7070
"name": "clue/stream-filter",
71-
"version": "v1.4.1",
72-
@@ -1513,6 +1558,88 @@
71+
"version": "v1.5.0",
72+
@@ -1562,6 +1607,103 @@
7373
],
74-
"time": "2020-05-29T18:32:49+00:00"
74+
"time": "2021-01-14T21:52:44+00:00"
7575
},
7676
+ {
7777
+ "name": "gedmo/doctrine-extensions",
78-
+ "version": "v2.4.41",
78+
+ "version": "v3.0.3",
7979
+ "source": {
8080
+ "type": "git",
8181
+ "url": "https://github.com/Atlantic18/DoctrineExtensions.git",
82-
+ "reference": "e55a6727052f91834a968937c93b6fb193be8fb6"
82+
+ "reference": "b4302ede2e247a6cc884b302a5f7146e08bd1b18"
8383
+ },
8484
+ "dist": {
8585
+ "type": "zip",
86-
+ "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/e55a6727052f91834a968937c93b6fb193be8fb6",
87-
+ "reference": "e55a6727052f91834a968937c93b6fb193be8fb6",
86+
+ "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/b4302ede2e247a6cc884b302a5f7146e08bd1b18",
87+
+ "reference": "b4302ede2e247a6cc884b302a5f7146e08bd1b18",
8888
+ "shasum": ""
8989
+ },
9090
+ "require": {
9191
+ "behat/transliterator": "~1.2",
92-
+ "doctrine/common": "~2.4",
93-
+ "php": ">=5.3.2"
92+
+ "doctrine/annotations": "^1.2",
93+
+ "doctrine/cache": "^1.0",
94+
+ "doctrine/collections": "^1.0",
95+
+ "doctrine/common": "^2.13 || ^3.0",
96+
+ "doctrine/event-manager": "^1.0",
97+
+ "php": "^7.2 || ^8.0"
9498
+ },
9599
+ "conflict": {
96-
+ "doctrine/annotations": "<1.2",
97-
+ "doctrine/mongodb-odm": ">=2.0"
100+
+ "doctrine/mongodb": "<1.3",
101+
+ "doctrine/mongodb-odm": "<2.0",
102+
+ "sebastian/comparator": "<2.0"
103+
+ },
104+
+ "provide": {
105+
+ "ext-mongo": "1.6.12"
98106
+ },
99107
+ "require-dev": {
100-
+ "doctrine/common": ">=2.5.0",
101-
+ "doctrine/mongodb-odm": ">=1.0.2 <2.0",
102-
+ "doctrine/orm": ">=2.5.0",
103-
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
104-
+ "symfony/yaml": "^2.6 || ^3.0 || ^4.0 || ^5.0"
108+
+ "alcaeus/mongo-php-adapter": "^1.1",
109+
+ "doctrine/mongodb-odm": "^2.0",
110+
+ "doctrine/orm": "^2.6.3",
111+
+ "friendsofphp/php-cs-fixer": "^2.16",
112+
+ "phpunit/phpunit": "^8.5",
113+
+ "symfony/yaml": "^4.1"
105114
+ },
106115
+ "suggest": {
107116
+ "doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
@@ -110,12 +119,12 @@ index 95d193cf..c4ebb8c9 100644
110119
+ "type": "library",
111120
+ "extra": {
112121
+ "branch-alias": {
113-
+ "dev-master": "2.4.x-dev"
122+
+ "dev-master": "3.0-dev"
114123
+ }
115124
+ },
116125
+ "autoload": {
117126
+ "psr-4": {
118-
+ "Gedmo\\": "lib/Gedmo"
127+
+ "Gedmo\\": "src/"
119128
+ }
120129
+ },
121130
+ "notification-url": "https://packagist.org/downloads/",
@@ -153,31 +162,37 @@ index 95d193cf..c4ebb8c9 100644
153162
+ "tree",
154163
+ "uploadable"
155164
+ ],
156-
+ "time": "2020-05-10T22:20:03+00:00"
165+
+ "support": {
166+
+ "email": "gediminas.morkevicius@gmail.com",
167+
+ "issues": "https://github.com/Atlantic18/DoctrineExtensions/issues",
168+
+ "source": "https://github.com/Atlantic18/DoctrineExtensions/tree/v3.0.3",
169+
+ "wiki": "https://github.com/Atlantic18/DoctrineExtensions/tree/main/doc"
170+
+ },
171+
+ "time": "2021-01-23T23:40:14+00:00"
157172
+ },
158173
{
159-
"name": "guzzlehttp/guzzle",
160-
"version": "6.5.5",
161-
@@ -3253,6 +3380,72 @@
174+
"name": "guzzlehttp/promises",
175+
"version": "1.4.0",
176+
@@ -3516,6 +3658,76 @@
162177
],
163-
"time": "2020-07-08T10:36:55+00:00"
178+
"time": "2021-03-03T16:05:24+00:00"
164179
},
165180
+ {
166181
+ "name": "stof/doctrine-extensions-bundle",
167-
+ "version": "v1.4.0",
182+
+ "version": "v1.5.0",
168183
+ "source": {
169184
+ "type": "git",
170185
+ "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
171-
+ "reference": "4d340daa1a8304faa62260be2adb0180e2138af3"
186+
+ "reference": "c01e73e49cee5eac3353b6c4ebdbb0a151348c85"
172187
+ },
173188
+ "dist": {
174189
+ "type": "zip",
175-
+ "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/4d340daa1a8304faa62260be2adb0180e2138af3",
176-
+ "reference": "4d340daa1a8304faa62260be2adb0180e2138af3",
190+
+ "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/c01e73e49cee5eac3353b6c4ebdbb0a151348c85",
191+
+ "reference": "c01e73e49cee5eac3353b6c4ebdbb0a151348c85",
177192
+ "shasum": ""
178193
+ },
179194
+ "require": {
180-
+ "gedmo/doctrine-extensions": "^2.3.4",
195+
+ "gedmo/doctrine-extensions": "^2.3.4 || ^3.0.0",
181196
+ "php": "^7.1.3",
182197
+ "symfony/framework-bundle": "^4.3 || ^5.0"
183198
+ },
@@ -193,7 +208,7 @@ index 95d193cf..c4ebb8c9 100644
193208
+ "type": "symfony-bundle",
194209
+ "extra": {
195210
+ "branch-alias": {
196-
+ "dev-master": "1.3.x-dev"
211+
+ "dev-master": "1.5.x-dev"
197212
+ }
198213
+ },
199214
+ "autoload": {
@@ -226,7 +241,11 @@ index 95d193cf..c4ebb8c9 100644
226241
+ "translatable",
227242
+ "tree"
228243
+ ],
229-
+ "time": "2020-03-30T09:00:40+00:00"
244+
+ "support": {
245+
+ "issues": "https://github.com/stof/StofDoctrineExtensionsBundle/issues",
246+
+ "source": "https://github.com/stof/StofDoctrineExtensionsBundle/tree/v1.5.0"
247+
+ },
248+
+ "time": "2020-09-30T13:25:17+00:00"
230249
+ },
231250
{
232251
"name": "symfony/asset",
@@ -252,7 +271,7 @@ index 00000000..c83f3b1d
252271
+stof_doctrine_extensions:
253272
+ default_locale: en_US
254273
diff --git a/symfony.lock b/symfony.lock
255-
index e63eccff..bae29965 100644
274+
index 176763d4..2855f019 100644
256275
--- a/symfony.lock
257276
+++ b/symfony.lock
258277
@@ -1,4 +1,7 @@
@@ -263,17 +282,17 @@ index e63eccff..bae29965 100644
263282
"clue/stream-filter": {
264283
"version": "v1.4.1"
265284
},
266-
@@ -102,6 +105,9 @@
267-
"fzaninotto/faker": {
268-
"version": "v1.9.1"
285+
@@ -99,6 +102,9 @@
286+
"fakerphp/faker": {
287+
"version": "v1.13.0"
269288
},
270289
+ "gedmo/doctrine-extensions": {
271290
+ "version": "v2.4.41"
272291
+ },
273-
"guzzlehttp/guzzle": {
274-
"version": "6.5.2"
292+
"friendsofphp/proxy-manager-lts": {
293+
"version": "v1.0.3"
275294
},
276-
@@ -216,6 +222,18 @@
295+
@@ -228,6 +234,18 @@
277296
"config/packages/sentry.yaml"
278297
]
279298
},

0 commit comments

Comments
 (0)