Skip to content

Commit 03249a6

Browse files
authored
Merge branch '2024.x' into patch-2
2 parents 01314ec + 18aca11 commit 03249a6

File tree

2 files changed

+173
-5
lines changed

2 files changed

+173
-5
lines changed

composer.enterprise.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
},
1313
"prefer-stable": true,
1414
"require": {
15-
"pimcore/pimcore": "^11.0",
16-
"pimcore/admin-ui-classic-bundle": "^1.0",
17-
"pimcore/platform-version": "^2023.1",
18-
"symfony/runtime": "^6.2",
19-
"symfony/dotenv": "^6.2"
15+
"pimcore/pimcore": "*",
16+
"pimcore/platform-version": "^2024.3",
17+
"pimcore/admin-ui-classic-bundle": "*",
18+
"symfony/amqp-messenger": "^6.2",
19+
"symfony/dotenv": "^6.2",
20+
"symfony/runtime": "^6.2"
2021
},
2122
"require-dev": {
2223
"codeception/codeception": "^5.0.3",

symfony.lock

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
{
2+
"codeception/codeception": {
3+
"version": "99999",
4+
"recipe": {
5+
"repo": "github.com/symfony/recipes-contrib"
6+
}
7+
},
8+
"doctrine/annotations": {
9+
"version": "99999",
10+
"recipe": {
11+
"repo": "github.com/symfony/recipes"
12+
}
13+
},
14+
"doctrine/doctrine-bundle": {
15+
"version": "99999",
16+
"recipe": {
17+
"repo": "github.com/symfony/recipes"
18+
}
19+
},
20+
"doctrine/doctrine-migrations-bundle": {
21+
"version": "99999",
22+
"recipe": {
23+
"repo": "github.com/symfony/recipes"
24+
}
25+
},
26+
"friendsofsymfony/jsrouting-bundle": {
27+
"version": "99999",
28+
"recipe": {
29+
"repo": "github.com/symfony/recipes-contrib"
30+
}
31+
},
32+
"knplabs/knp-paginator-bundle": {
33+
"version": "99999"
34+
},
35+
"league/flysystem-bundle": {
36+
"version": "99999",
37+
"recipe": {
38+
"repo": "github.com/symfony/recipes"
39+
}
40+
},
41+
"phpunit/phpunit": {
42+
"version": "99999",
43+
"recipe": {
44+
"repo": "github.com/symfony/recipes"
45+
}
46+
},
47+
"pimcore/pimcore": {
48+
"version": "99999"
49+
},
50+
"presta/sitemap-bundle": {
51+
"version": "99999"
52+
},
53+
"scheb/2fa-bundle": {
54+
"version": "99999",
55+
"recipe": {
56+
"repo": "github.com/symfony/recipes"
57+
}
58+
},
59+
"symfony-cmf/routing-bundle": {
60+
"version": "99999"
61+
},
62+
"symfony/console": {
63+
"version": "99999",
64+
"recipe": {
65+
"repo": "github.com/symfony/recipes"
66+
}
67+
},
68+
"symfony/debug-bundle": {
69+
"version": "99999",
70+
"recipe": {
71+
"repo": "github.com/symfony/recipes"
72+
}
73+
},
74+
"symfony/flex": {
75+
"version": "99999",
76+
"recipe": {
77+
"repo": "github.com/symfony/recipes"
78+
}
79+
},
80+
"symfony/framework-bundle": {
81+
"version": "99999",
82+
"recipe": {
83+
"repo": "github.com/symfony/recipes"
84+
}
85+
},
86+
"symfony/lock": {
87+
"version": "99999",
88+
"recipe": {
89+
"repo": "github.com/symfony/recipes"
90+
}
91+
},
92+
"symfony/mailer": {
93+
"version": "99999",
94+
"recipe": {
95+
"repo": "github.com/symfony/recipes"
96+
}
97+
},
98+
"symfony/messenger": {
99+
"version": "99999",
100+
"recipe": {
101+
"repo": "github.com/symfony/recipes"
102+
}
103+
},
104+
"symfony/monolog-bundle": {
105+
"version": "99999",
106+
"recipe": {
107+
"repo": "github.com/symfony/recipes"
108+
}
109+
},
110+
"symfony/routing": {
111+
"version": "99999",
112+
"recipe": {
113+
"repo": "github.com/symfony/recipes"
114+
}
115+
},
116+
"symfony/security-bundle": {
117+
"version": "99999",
118+
"recipe": {
119+
"repo": "github.com/symfony/recipes"
120+
}
121+
},
122+
"symfony/translation": {
123+
"version": "99999",
124+
"recipe": {
125+
"repo": "github.com/symfony/recipes"
126+
}
127+
},
128+
"symfony/twig-bundle": {
129+
"version": "99999",
130+
"recipe": {
131+
"repo": "github.com/symfony/recipes"
132+
}
133+
},
134+
"symfony/uid": {
135+
"version": "99999",
136+
"recipe": {
137+
"repo": "github.com/symfony/recipes"
138+
}
139+
},
140+
"symfony/validator": {
141+
"version": "99999",
142+
"recipe": {
143+
"repo": "github.com/symfony/recipes"
144+
}
145+
},
146+
"symfony/web-profiler-bundle": {
147+
"version": "99999",
148+
"recipe": {
149+
"repo": "github.com/symfony/recipes"
150+
}
151+
},
152+
"symfony/webpack-encore-bundle": {
153+
"version": "99999",
154+
"recipe": {
155+
"repo": "github.com/symfony/recipes"
156+
}
157+
},
158+
"symfony/workflow": {
159+
"version": "99999",
160+
"recipe": {
161+
"repo": "github.com/symfony/recipes"
162+
}
163+
},
164+
"twig/extra-bundle": {
165+
"version": "99999"
166+
}
167+
}

0 commit comments

Comments
 (0)