Skip to content

Fixed scoper-autoload.php PHP 5.6 incompatibility #1024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 3, 2024
Merged

Fixed scoper-autoload.php PHP 5.6 incompatibility #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57551d4
Fixed scoper-autoload.php PHP 5.6 incompatibility
marekdedic Apr 29, 2024
218d1aa
Merge branch 'main' into php-5-fix
theofidry May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Autoload/ScoperAutoloadGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function dump(): string
namespace {
\$loader = (static function () {
// Backup the autoloaded Composer files
\$existingComposerAutoloadFiles = \$GLOBALS['__composer_autoload_files'] ?? [];
\$existingComposerAutoloadFiles = isset(\$GLOBALS['__composer_autoload_files']) ? \$GLOBALS['__composer_autoload_files'] : [];

\$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -135,7 +135,7 @@ public function dump(): string

\$loader = (static function () {
// Backup the autoloaded Composer files
\$existingComposerAutoloadFiles = \$GLOBALS['__composer_autoload_files'] ?? [];
\$existingComposerAutoloadFiles = isset(\$GLOBALS['__composer_autoload_files']) ? \$GLOBALS['__composer_autoload_files'] : [];

\$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down
6 changes: 3 additions & 3 deletions tests/Autoload/AutoloadDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public static function autoloadProvider(): iterable

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

// @generated by Humbug Box

Expand Down Expand Up @@ -252,7 +252,7 @@ public static function autoloadProvider(): iterable

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

// @generated by Humbug Box

Expand Down Expand Up @@ -350,7 +350,7 @@ public static function autoloadProvider(): iterable
namespace {
$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

// @generated by Humbug Box

Expand Down
24 changes: 12 additions & 12 deletions tests/Autoload/ScoperAutoloadGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function provideRegistry(): iterable

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -79,7 +79,7 @@ public static function provideRegistry(): iterable

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -115,7 +115,7 @@ public static function provideRegistry(): iterable

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -156,7 +156,7 @@ public static function provideRegistry(): iterable

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -199,7 +199,7 @@ public static function provideRegistry(): iterable
namespace {
$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -251,7 +251,7 @@ public static function provideRegistry(): iterable
namespace {
$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -303,7 +303,7 @@ public static function provideRegistry(): iterable
namespace {
$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -352,7 +352,7 @@ classes: [

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -399,7 +399,7 @@ classes: [

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -454,7 +454,7 @@ function humbug_phpscoper_expose_class($exposed, $prefixed) {
namespace {
$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -522,7 +522,7 @@ function humbug_phpscoper_expose_class($exposed, $prefixed) {

$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down Expand Up @@ -564,7 +564,7 @@ function humbug_phpscoper_expose_class($exposed, $prefixed) {
namespace {
$loader = (static function () {
// Backup the autoloaded Composer files
$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
$existingComposerAutoloadFiles = isset($GLOBALS['__composer_autoload_files']) ? $GLOBALS['__composer_autoload_files'] : [];

$loader = require_once __DIR__.'/autoload.php';
// Ensure InstalledVersions is available
Expand Down
Loading