Skip to content

Commit d435d88

Browse files
dimitriBouteilledimitriBouteille
authored
Merge branch '2.4-develop' into phpdoc/scopeConfig
2 parents aa0fabc + d220f78 commit d435d88

File tree

11 files changed

+169
-182
lines changed

11 files changed

+169
-182
lines changed

‎composer.lock

+140-140
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/api-functional/framework/bootstrap.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66

77
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -141,7 +141,6 @@ function ($errNo, $errStr, $errFile, $errLine) {
141141
E_USER_ERROR => 'User Error',
142142
E_USER_WARNING => 'User Warning',
143143
E_USER_NOTICE => 'User Notice',
144-
E_STRICT => 'Strict',
145144
E_RECOVERABLE_ERROR => 'Recoverable Error',
146145
E_DEPRECATED => 'Deprecated',
147146
E_USER_DEPRECATED => 'User Deprecated',

‎dev/tests/error_handler.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2017 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
@@ -25,7 +25,6 @@ function ($errNo, $errStr, $errFile, $errLine) {
2525
E_USER_ERROR => 'User Error',
2626
E_USER_WARNING => 'User Warning',
2727
E_USER_NOTICE => 'User Notice',
28-
E_STRICT => 'Strict',
2928
E_RECOVERABLE_ERROR => 'Recoverable Error',
3029
E_DEPRECATED => 'Deprecated',
3130
E_USER_DEPRECATED => 'User Deprecated',

‎dev/tests/integration/framework/bootstrap.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
use Magento\Framework\Autoload\AutoloaderRegistry;
77

@@ -149,7 +149,6 @@ function ($errNo, $errStr, $errFile, $errLine) {
149149
E_USER_ERROR => 'User Error',
150150
E_USER_WARNING => 'User Warning',
151151
E_USER_NOTICE => 'User Notice',
152-
E_STRICT => 'Strict',
153152
E_RECOVERABLE_ERROR => 'Recoverable Error',
154153
E_DEPRECATED => 'Deprecated',
155154
E_USER_DEPRECATED => 'User Deprecated',

‎dev/tests/static/framework/bootstrap.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
// phpcs:disable
@@ -63,7 +63,6 @@ function ($errNo, $errStr, $errFile, $errLine) {
6363
E_USER_ERROR => 'User Error',
6464
E_USER_WARNING => 'User Warning',
6565
E_USER_NOTICE => 'User Notice',
66-
E_STRICT => 'Strict',
6766
E_RECOVERABLE_ERROR => 'Recoverable Error',
6867
E_DEPRECATED => 'Deprecated',
6968
E_USER_DEPRECATED => 'User Deprecated',

‎dev/tests/unit/framework/bootstrap.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
require_once __DIR__ . '/../../../../app/autoload.php';
@@ -54,7 +54,6 @@ function ($errNo, $errStr, $errFile, $errLine) {
5454
E_USER_ERROR => 'User Error',
5555
E_USER_WARNING => 'User Warning',
5656
E_USER_NOTICE => 'User Notice',
57-
E_STRICT => 'Strict',
5857
E_RECOVERABLE_ERROR => 'Recoverable Error',
5958
E_DEPRECATED => 'Deprecated',
6059
E_USER_DEPRECATED => 'User Deprecated',

‎lib/internal/Magento/Framework/App/ErrorHandler.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Framework\App;
@@ -28,7 +28,6 @@ class ErrorHandler
2828
E_USER_ERROR => 'User Error',
2929
E_USER_WARNING => 'User Warning',
3030
E_USER_NOTICE => 'User Notice',
31-
E_STRICT => 'Strict Notice',
3231
E_RECOVERABLE_ERROR => 'Recoverable Error',
3332
E_DEPRECATED => 'Deprecated Functionality',
3433
E_USER_DEPRECATED => 'User Deprecated Functionality',

‎lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
6+
67
declare(strict_types=1);
78

89
namespace Magento\Framework\App\Test\Unit;
@@ -82,7 +83,6 @@ public static function handlerProviderException()
8283
[E_USER_ERROR, 'User Error'],
8384
[E_USER_WARNING, 'User Warning'],
8485
[E_USER_NOTICE, 'User Notice'],
85-
[E_STRICT, 'Strict Notice'],
8686
[E_RECOVERABLE_ERROR, 'Recoverable Error'],
8787
[E_DEPRECATED, 'Deprecated Functionality'],
8888
[E_USER_DEPRECATED, 'User Deprecated Functionality'],

‎lib/internal/Magento/Framework/Session/SessionManager.php

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Framework\Session;
77

@@ -258,12 +258,8 @@ private function renewCookie($sid)
258258
protected function registerSaveHandler()
259259
{
260260
return session_set_save_handler(
261-
[$this->saveHandler, 'open'],
262-
[$this->saveHandler, 'close'],
263-
[$this->saveHandler, 'read'],
264-
[$this->saveHandler, 'write'],
265-
[$this->saveHandler, 'destroy'],
266-
[$this->saveHandler, 'gc']
261+
$this->saveHandler,
262+
true
267263
);
268264
}
269265

‎package.json.sample

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
},
1010
"homepage": "https://magento.com/",
1111
"devDependencies": {
12-
"glob": "~8.1.0",
12+
"glob": "~11.0.0",
1313
"grunt": "~1.6.1",
1414
"grunt-banner": "~0.6.0",
1515
"grunt-continue": "~0.1.0",
1616
"grunt-contrib-clean": "~2.0.1",
17-
"grunt-contrib-connect": "~4.0.0",
17+
"grunt-contrib-connect": "~5.0.1",
1818
"grunt-contrib-cssmin": "~5.0.0",
1919
"grunt-contrib-imagemin": "~4.0.0",
2020
"grunt-contrib-jasmine": "~4.0.0",
2121
"grunt-contrib-less": "~3.0.0",
2222
"grunt-contrib-watch": "~1.1.0",
23-
"grunt-eslint": "~24.3.0",
23+
"grunt-eslint": "~25.0.0",
2424
"grunt-exec": "~3.0.0",
2525
"grunt-replace": "~2.0.2",
2626
"grunt-styledocco": "~0.3.0",
@@ -32,11 +32,11 @@
3232
"morgan": "~1.10.0",
3333
"node-minify": "~3.6.0",
3434
"path": "~0.12.7",
35-
"serve-static": "~1.15.0",
35+
"serve-static": "~1.16.2",
3636
"squirejs": "~0.2.1",
3737
"strip-comments": "~2.0.1",
3838
"time-grunt": "~2.0.0",
39-
"underscore": "1.13.6"
39+
"underscore": "1.13.7"
4040
},
4141
"overrides": {
4242
"styledocco": {

‎setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Directory.php

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Setup\Module\Di\Code\Reader\Decorator;
77

88
use Magento\Setup\Module\Di\Compiler\Log\Log;
99

10-
/**
11-
* Class Directory
12-
*
13-
* @package Magento\Setup\Module\Di\Code\Reader\Decorator
14-
*/
1510
class Directory implements \Magento\Setup\Module\Di\Code\Reader\ClassesScannerInterface
1611
{
1712
/**
@@ -69,7 +64,7 @@ public function __construct(
6964
$this->validator = $validator;
7065
$this->generationDir = $generationDir;
7166

72-
set_error_handler([$this, 'errorHandler'], E_STRICT);
67+
set_error_handler([$this, 'errorHandler'], E_NOTICE);
7368
}
7469

7570
/**
@@ -112,6 +107,8 @@ public function getList($path)
112107
}
113108

114109
/**
110+
* Retrieves relations
111+
*
115112
* @return array
116113
*/
117114
public function getRelations()

0 commit comments

Comments
 (0)