Skip to content

Commit 69a0af4

Browse files
author
Jimmy
committed
Add version 2.3.0
1 parent ca1f1e3 commit 69a0af4

File tree

22,055 files changed

+843953
-624138
lines changed

Some content is hidden

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

22,055 files changed

+843953
-624138
lines changed

.github/.htaccess

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<IfVersion < 2.4>
2-
order allow,deny
3-
deny from all
2+
Order deny,allow
3+
Deny from all
44
</IfVersion>
55
<IfVersion >= 2.4>
66
Require all denied
77
</IfVersion>
8-

.htaccess

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
Require all denied
347347
</IfVersion>
348348
</Files>
349-
<Files auth.json>
349+
<Files magento_umask>
350350
<IfVersion < 2.4>
351351
order allow,deny
352352
deny from all
@@ -355,7 +355,7 @@
355355
Require all denied
356356
</IfVersion>
357357
</Files>
358-
<Files magento_umask>
358+
<Files auth.json>
359359
<IfVersion < 2.4>
360360
order allow,deny
361361
deny from all

.htaccess.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
Require all denied
324324
</IfVersion>
325325
</Files>
326-
<Files auth.json>
326+
<Files magento_umask>
327327
<IfVersion < 2.4>
328328
order allow,deny
329329
deny from all
@@ -332,7 +332,7 @@
332332
Require all denied
333333
</IfVersion>
334334
</Files>
335-
<Files magento_umask>
335+
<Files auth.json>
336336
<IfVersion < 2.4>
337337
order allow,deny
338338
deny from all

.php_cs.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
/**
8+
* PHP Coding Standards fixer configuration
9+
*/
10+
711
$finder = PhpCsFixer\Finder::create()
812
->name('*.phtml')
913
->exclude('dev/tests/functional/generated')

.travis.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ addons:
1111
firefox: "46.0"
1212
hosts:
1313
- magento2.travis
14+
services:
15+
- rabbitmq
16+
- elasticsearch
1417
language: php
1518
php:
16-
- 7.0
1719
- 7.1
18-
git:
19-
depth: 5
20+
- 7.2
2021
env:
2122
global:
2223
- COMPOSER_BIN_DIR=~/bin
@@ -34,13 +35,13 @@ env:
3435
- TEST_SUITE=functional
3536
matrix:
3637
exclude:
37-
- php: 7.0
38+
- php: 7.1
3839
env: TEST_SUITE=static
39-
- php: 7.0
40+
- php: 7.1
4041
env: TEST_SUITE=js GRUNT_COMMAND=spec
41-
- php: 7.0
42+
- php: 7.1
4243
env: TEST_SUITE=js GRUNT_COMMAND=static
43-
- php: 7.0
44+
- php: 7.1
4445
env: TEST_SUITE=functional
4546
cache:
4647
apt: true
@@ -49,8 +50,10 @@ cache:
4950
- $HOME/.nvm
5051
- $HOME/node_modules
5152
- $HOME/yarn.lock
52-
before_install: ./dev/travis/before_install.sh
53-
install: composer install --no-interaction --prefer-dist
53+
before_install:
54+
- curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
55+
- ./dev/travis/before_install.sh
56+
install: composer install --no-interaction
5457
before_script: ./dev/travis/before_script.sh
5558
script:
5659
# Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails

CHANGELOG.md

Lines changed: 2 additions & 2158 deletions
Large diffs are not rendered by default.

app/etc/NonComposerComponentRegistration.php

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,30 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
$pathList[] = dirname(__DIR__) . '/code/*/*/cli_commands.php';
8-
$pathList[] = dirname(__DIR__) . '/code/*/*/registration.php';
9-
$pathList[] = dirname(__DIR__) . '/design/*/*/*/registration.php';
10-
$pathList[] = dirname(__DIR__) . '/i18n/*/*/registration.php';
11-
$pathList[] = dirname(dirname(__DIR__)) . '/lib/internal/*/*/registration.php';
12-
$pathList[] = dirname(dirname(__DIR__)) . '/lib/internal/*/*/*/registration.php';
13-
foreach ($pathList as $path) {
14-
// Sorting is disabled intentionally for performance improvement
15-
$files = glob($path, GLOB_NOSORT);
16-
if ($files === false) {
17-
throw new \RuntimeException('glob() returned error while searching in \'' . $path . '\'');
18-
}
19-
foreach ($files as $file) {
20-
include $file;
7+
//Register components (via a list of glob patterns)
8+
namespace Magento\NonComposerComponentRegistration;
9+
10+
use RuntimeException;
11+
12+
/**
13+
* Include files from a list of glob patterns
14+
*
15+
* @throws RuntimeException
16+
* @return void
17+
*/
18+
function main()
19+
{
20+
$globPatterns = require __DIR__ . '/registration_globlist.php';
21+
$baseDir = dirname(dirname(__DIR__)) . '/';
22+
23+
foreach ($globPatterns as $globPattern) {
24+
// Sorting is disabled intentionally for performance improvement
25+
$files = glob($baseDir . $globPattern, GLOB_NOSORT);
26+
if ($files === false) {
27+
throw new RuntimeException("glob(): error with '$baseDir$globPattern'");
28+
}
29+
array_map(function ($file) { require_once $file; }, $files);
2130
}
2231
}
32+
33+
main();

app/etc/db_schema.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
10+
<table name="patch_list" resource="default" comment="List of data/schema patches">
11+
<column xsi:type="int" name="patch_id" identity="true" comment="Patch Auto Increment" />
12+
<column xsi:type="varchar" name="patch_name" length="1024" nullable="false" comment="Patch Class Name" />
13+
<constraint xsi:type="primary" referenceId="PRIMARY">
14+
<column name="patch_id" />
15+
</constraint>
16+
</table>
17+
</schema>

0 commit comments

Comments
 (0)