Skip to content

Commit 36c54da

Browse files
committed
compile after composer.json tweak
1 parent 11a60bb commit 36c54da

8 files changed

+20
-20
lines changed

_tuts/drivebasics-install-turbo.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ index fbcedcd..6f27124 100644
1616
},
1717
"entrypoints": []
1818
diff --git a/composer.json b/composer.json
19-
index 5404aa4..fb5904c 100644
19+
index deeaba5..332e5dd 100644
2020
--- a/composer.json
2121
+++ b/composer.json
2222
@@ -27,6 +27,7 @@

_tuts/mercure-install-symfony-ux-turbo-mercure.diff

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ index 6f27124..b7f5fb5 100644
3434
},
3535
"entrypoints": []
3636
diff --git a/composer.json b/composer.json
37-
index 3025d38..3b9fbca 100644
37+
index 74f2b73..3b9fbca 100644
3838
--- a/composer.json
3939
+++ b/composer.json
4040
@@ -28,6 +28,7 @@
@@ -45,16 +45,6 @@ index 3025d38..3b9fbca 100644
4545
"symfony/validator": "5.3.*",
4646
"symfony/webpack-encore-bundle": "^1.9",
4747
"symfony/yaml": "5.3.*",
48-
@@ -46,7 +47,8 @@
49-
"php": "7.4.0"
50-
},
51-
"allow-plugins": {
52-
- "symfony/flex": true
53-
+ "symfony/flex": true,
54-
+ "symfony/runtime": true
55-
}
56-
},
57-
"autoload": {
5848
diff --git a/composer.lock b/composer.lock
5949
index b541f5f..4f2ece9 100644
6050
--- a/composer.lock

_tuts/pre-turbo-empty-migrations.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/composer.json b/composer.json
2-
index 5495686..5404aa4 100644
2+
index 6029acc..deeaba5 100644
33
--- a/composer.json
44
+++ b/composer.json
55
@@ -10,7 +10,6 @@

_tuts/pre-turbo-foundry.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/composer.json b/composer.json
2-
index 1373d98..5495686 100644
2+
index 11d9b6a..6029acc 100644
33
--- a/composer.json
44
+++ b/composer.json
5-
@@ -91,6 +91,7 @@
5+
@@ -92,6 +92,7 @@
66
"symfony/monolog-bundle": "^3.0",
77
"symfony/stopwatch": "^5.2",
88
"symfony/var-dumper": "^5.2",

_tuts/pre-turbo-upgrade-deps.diff

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/composer.json b/composer.json
2-
index 10fe8b5..aaa3099 100644
2+
index 10fe8b5..7ec497e 100644
33
--- a/composer.json
44
+++ b/composer.json
55
@@ -1,7 +1,7 @@
@@ -49,7 +49,17 @@ index 10fe8b5..aaa3099 100644
4949
"twig/extra-bundle": "^2.12|^3.0",
5050
"twig/intl-extra": "^3.2",
5151
"twig/twig": "^2.12|^3.0"
52-
@@ -80,7 +80,7 @@
52+
@@ -44,7 +44,8 @@
53+
"php": "7.4.0"
54+
},
55+
"allow-plugins": {
56+
- "symfony/flex": true
57+
+ "symfony/flex": true,
58+
+ "symfony/runtime": true
59+
}
60+
},
61+
"autoload": {
62+
@@ -80,7 +81,7 @@
5363
"extra": {
5464
"symfony": {
5565
"allow-contrib": false,

_tuts/pre-turbo-upgrading-recipes.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ index 8fe9d49..c933dc5 100755
5252
+ return new Application($kernel);
5353
+};
5454
diff --git a/composer.json b/composer.json
55-
index aaa3099..1373d98 100644
55+
index 7ec497e..11d9b6a 100644
5656
--- a/composer.json
5757
+++ b/composer.json
5858
@@ -23,6 +23,7 @@

_tuts/see-more-install-twig-string-extra.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/composer.json b/composer.json
2-
index fb5904c..3025d38 100644
2+
index 332e5dd..74f2b73 100644
33
--- a/composer.json
44
+++ b/composer.json
55
@@ -33,6 +33,7 @@

_tuts/steps.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1786,5 +1786,5 @@
17861786
"description": null
17871787
}
17881788
],
1789-
"sha": "11e4a6b1089803cef375f0509d5eb7b6b37fcbf5"
1789+
"sha": "11a60bbeae632898fc6410090f5ccfec065d651d"
17901790
}

0 commit comments

Comments
 (0)