Skip to content

Commit cf4be3d

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1706 from magento-engcom/develop-prs
Public Pull Requests #12155 update button.phtml overcomplicated translation phrase. Magento 2.3 by @ChuckyK #11680 #8022: Uncaught Error: Call to a member function addItem() on array in app/code/Magento/Sales/Model/Order/Shipment.php by @RomaKis #11466 migrated pull request #11459 to 2.3 develop by @jonashrem Fixed Public Issues #8022 Uncaught Error: Call to a member function addItem() on array in app/code/Magento/Sales/Model/Order/Shipment.php #10810 Add support of apache2.4 commands in htaccess
2 parents 2321610 + 9628956 commit cf4be3d

File tree

34 files changed

+487
-131
lines changed

34 files changed

+487
-131
lines changed

‎.github/.htaccess

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
Order deny,allow
3+
Deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>

‎.htaccess

+119-34
Original file line numberDiff line numberDiff line change
@@ -203,72 +203,157 @@
203203
RedirectMatch 403 /\.git
204204

205205
<Files composer.json>
206-
order allow,deny
207-
deny from all
206+
<IfVersion < 2.4>
207+
order allow,deny
208+
deny from all
209+
</IfVersion>
210+
<IfVersion >= 2.4>
211+
Require all denied
212+
</IfVersion>
208213
</Files>
209214
<Files composer.lock>
210-
order allow,deny
211-
deny from all
215+
<IfVersion < 2.4>
216+
order allow,deny
217+
deny from all
218+
</IfVersion>
219+
<IfVersion >= 2.4>
220+
Require all denied
221+
</IfVersion>
212222
</Files>
213223
<Files .gitignore>
214-
order allow,deny
215-
deny from all
224+
<IfVersion < 2.4>
225+
order allow,deny
226+
deny from all
227+
</IfVersion>
228+
<IfVersion >= 2.4>
229+
Require all denied
230+
</IfVersion>
216231
</Files>
217232
<Files .htaccess>
218-
order allow,deny
219-
deny from all
233+
<IfVersion < 2.4>
234+
order allow,deny
235+
deny from all
236+
</IfVersion>
237+
<IfVersion >= 2.4>
238+
Require all denied
239+
</IfVersion>
220240
</Files>
221241
<Files .htaccess.sample>
222-
order allow,deny
223-
deny from all
242+
<IfVersion < 2.4>
243+
order allow,deny
244+
deny from all
245+
</IfVersion>
246+
<IfVersion >= 2.4>
247+
Require all denied
248+
</IfVersion>
224249
</Files>
225250
<Files .php_cs.dist>
226-
order allow,deny
227-
deny from all
251+
<IfVersion < 2.4>
252+
order allow,deny
253+
deny from all
254+
</IfVersion>
255+
<IfVersion >= 2.4>
256+
Require all denied
257+
</IfVersion>
228258
</Files>
229259
<Files .travis.yml>
230-
order allow,deny
231-
deny from all
260+
<IfVersion < 2.4>
261+
order allow,deny
262+
deny from all
263+
</IfVersion>
264+
<IfVersion >= 2.4>
265+
Require all denied
266+
</IfVersion>
232267
</Files>
233268
<Files CHANGELOG.md>
234-
order allow,deny
235-
deny from all
269+
<IfVersion < 2.4>
270+
order allow,deny
271+
deny from all
272+
</IfVersion>
273+
<IfVersion >= 2.4>
274+
Require all denied
275+
</IfVersion>
236276
</Files>
237277
<Files COPYING.txt>
238-
order allow,deny
239-
deny from all
278+
<IfVersion < 2.4>
279+
order allow,deny
280+
deny from all
281+
</IfVersion>
282+
<IfVersion >= 2.4>
283+
Require all denied
284+
</IfVersion>
240285
</Files>
241286
<Files Gruntfile.js>
242-
order allow,deny
243-
deny from all
287+
<IfVersion < 2.4>
288+
order allow,deny
289+
deny from all
290+
</IfVersion>
291+
<IfVersion >= 2.4>
292+
Require all denied
293+
</IfVersion>
244294
</Files>
245295
<Files LICENSE.txt>
246-
order allow,deny
247-
deny from all
296+
<IfVersion < 2.4>
297+
order allow,deny
298+
deny from all
299+
</IfVersion>
300+
<IfVersion >= 2.4>
301+
Require all denied
302+
</IfVersion>
248303
</Files>
249304
<Files LICENSE_AFL.txt>
250-
order allow,deny
251-
deny from all
305+
<IfVersion < 2.4>
306+
order allow,deny
307+
deny from all
308+
</IfVersion>
309+
<IfVersion >= 2.4>
310+
Require all denied
311+
</IfVersion>
252312
</Files>
253313
<Files nginx.conf.sample>
254-
order allow,deny
255-
deny from all
314+
<IfVersion < 2.4>
315+
order allow,deny
316+
deny from all
317+
</IfVersion>
318+
<IfVersion >= 2.4>
319+
Require all denied
320+
</IfVersion>
256321
</Files>
257322
<Files package.json>
258-
order allow,deny
259-
deny from all
323+
<IfVersion < 2.4>
324+
order allow,deny
325+
deny from all
326+
</IfVersion>
327+
<IfVersion >= 2.4>
328+
Require all denied
329+
</IfVersion>
260330
</Files>
261331
<Files php.ini.sample>
262-
order allow,deny
263-
deny from all
332+
<IfVersion < 2.4>
333+
order allow,deny
334+
deny from all
335+
</IfVersion>
336+
<IfVersion >= 2.4>
337+
Require all denied
338+
</IfVersion>
264339
</Files>
265340
<Files README.md>
266-
order allow,deny
267-
deny from all
341+
<IfVersion < 2.4>
342+
order allow,deny
343+
deny from all
344+
</IfVersion>
345+
<IfVersion >= 2.4>
346+
Require all denied
347+
</IfVersion>
268348
</Files>
269349
<Files magento_umask>
270-
order allow,deny
271-
deny from all
350+
<IfVersion < 2.4>
351+
order allow,deny
352+
deny from all
353+
</IfVersion>
354+
<IfVersion >= 2.4>
355+
Require all denied
356+
</IfVersion>
272357
</Files>
273358

274359
# For 404s and 403s that aren't handled by the application, show plain 404 response

‎.htaccess.sample

+119-34
Original file line numberDiff line numberDiff line change
@@ -179,72 +179,157 @@
179179
RedirectMatch 403 /\.git
180180

181181
<Files composer.json>
182-
order allow,deny
183-
deny from all
182+
<IfVersion < 2.4>
183+
order allow,deny
184+
deny from all
185+
</IfVersion>
186+
<IfVersion >= 2.4>
187+
Require all denied
188+
</IfVersion>
184189
</Files>
185190
<Files composer.lock>
186-
order allow,deny
187-
deny from all
191+
<IfVersion < 2.4>
192+
order allow,deny
193+
deny from all
194+
</IfVersion>
195+
<IfVersion >= 2.4>
196+
Require all denied
197+
</IfVersion>
188198
</Files>
189199
<Files .gitignore>
190-
order allow,deny
191-
deny from all
200+
<IfVersion < 2.4>
201+
order allow,deny
202+
deny from all
203+
</IfVersion>
204+
<IfVersion >= 2.4>
205+
Require all denied
206+
</IfVersion>
192207
</Files>
193208
<Files .htaccess>
194-
order allow,deny
195-
deny from all
209+
<IfVersion < 2.4>
210+
order allow,deny
211+
deny from all
212+
</IfVersion>
213+
<IfVersion >= 2.4>
214+
Require all denied
215+
</IfVersion>
196216
</Files>
197217
<Files .htaccess.sample>
198-
order allow,deny
199-
deny from all
218+
<IfVersion < 2.4>
219+
order allow,deny
220+
deny from all
221+
</IfVersion>
222+
<IfVersion >= 2.4>
223+
Require all denied
224+
</IfVersion>
200225
</Files>
201226
<Files .php_cs.dist>
202-
order allow,deny
203-
deny from all
227+
<IfVersion < 2.4>
228+
order allow,deny
229+
deny from all
230+
</IfVersion>
231+
<IfVersion >= 2.4>
232+
Require all denied
233+
</IfVersion>
204234
</Files>
205235
<Files .travis.yml>
206-
order allow,deny
207-
deny from all
236+
<IfVersion < 2.4>
237+
order allow,deny
238+
deny from all
239+
</IfVersion>
240+
<IfVersion >= 2.4>
241+
Require all denied
242+
</IfVersion>
208243
</Files>
209244
<Files CHANGELOG.md>
210-
order allow,deny
211-
deny from all
245+
<IfVersion < 2.4>
246+
order allow,deny
247+
deny from all
248+
</IfVersion>
249+
<IfVersion >= 2.4>
250+
Require all denied
251+
</IfVersion>
212252
</Files>
213253
<Files COPYING.txt>
214-
order allow,deny
215-
deny from all
254+
<IfVersion < 2.4>
255+
order allow,deny
256+
deny from all
257+
</IfVersion>
258+
<IfVersion >= 2.4>
259+
Require all denied
260+
</IfVersion>
216261
</Files>
217262
<Files Gruntfile.js>
218-
order allow,deny
219-
deny from all
263+
<IfVersion < 2.4>
264+
order allow,deny
265+
deny from all
266+
</IfVersion>
267+
<IfVersion >= 2.4>
268+
Require all denied
269+
</IfVersion>
220270
</Files>
221271
<Files LICENSE.txt>
222-
order allow,deny
223-
deny from all
272+
<IfVersion < 2.4>
273+
order allow,deny
274+
deny from all
275+
</IfVersion>
276+
<IfVersion >= 2.4>
277+
Require all denied
278+
</IfVersion>
224279
</Files>
225280
<Files LICENSE_AFL.txt>
226-
order allow,deny
227-
deny from all
281+
<IfVersion < 2.4>
282+
order allow,deny
283+
deny from all
284+
</IfVersion>
285+
<IfVersion >= 2.4>
286+
Require all denied
287+
</IfVersion>
228288
</Files>
229289
<Files nginx.conf.sample>
230-
order allow,deny
231-
deny from all
290+
<IfVersion < 2.4>
291+
order allow,deny
292+
deny from all
293+
</IfVersion>
294+
<IfVersion >= 2.4>
295+
Require all denied
296+
</IfVersion>
232297
</Files>
233298
<Files package.json>
234-
order allow,deny
235-
deny from all
299+
<IfVersion < 2.4>
300+
order allow,deny
301+
deny from all
302+
</IfVersion>
303+
<IfVersion >= 2.4>
304+
Require all denied
305+
</IfVersion>
236306
</Files>
237307
<Files php.ini.sample>
238-
order allow,deny
239-
deny from all
308+
<IfVersion < 2.4>
309+
order allow,deny
310+
deny from all
311+
</IfVersion>
312+
<IfVersion >= 2.4>
313+
Require all denied
314+
</IfVersion>
240315
</Files>
241316
<Files README.md>
242-
order allow,deny
243-
deny from all
317+
<IfVersion < 2.4>
318+
order allow,deny
319+
deny from all
320+
</IfVersion>
321+
<IfVersion >= 2.4>
322+
Require all denied
323+
</IfVersion>
244324
</Files>
245325
<Files magento_umask>
246-
order allow,deny
247-
deny from all
326+
<IfVersion < 2.4>
327+
order allow,deny
328+
deny from all
329+
</IfVersion>
330+
<IfVersion >= 2.4>
331+
Require all denied
332+
</IfVersion>
248333
</Files>
249334

250335
# For 404s and 403s that aren't handled by the application, show plain 404 response

0 commit comments

Comments
 (0)