Skip to content

Commit cc8f0d6

Browse files
glo71317glo71317
committed
Merge remote-tracking branch 'origin/AC-13346' into Hammer-Platform-Health-Scope-02Dec24
2 parents 79d77c9 + 0e1ade2 commit cc8f0d6

File tree

8 files changed

+20
-29
lines changed

8 files changed

+20
-29
lines changed

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

Lines changed: 2 additions & 3 deletions
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

Lines changed: 2 additions & 3 deletions
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

Lines changed: 2 additions & 3 deletions
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

Lines changed: 2 additions & 3 deletions
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

Lines changed: 2 additions & 3 deletions
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

Lines changed: 2 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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'],

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

Lines changed: 5 additions & 8 deletions
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)