Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dca9325

Browse files
fabpotfabpot
committed
bug #32110 Revert "minor #32054 Prepare for PHP 7.4 preload (nicolas-grekas)" (nicolas-grekas)
This PR was merged into the 4.4 branch. Discussion ---------- Revert "minor #32054 Prepare for PHP 7.4 preload (nicolas-grekas)" | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32032 | License | MIT | Doc PR | - This reverts commit a0aa941, reversing changes made to 8496003. This change is incompatible with Composer's class map generation. Commits ------- 8a1813a Revert "minor #32054 Prepare for PHP 7.4 preload (nicolas-grekas)"
2 parents d31b716 + 8a1813a commit dca9325

21 files changed

+166
-384
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/CompatibilityServiceSubscriberInterface.contracts.php

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/CompatibilityServiceSubscriberInterface.legacy.php

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/CompatibilityServiceSubscriberInterface.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,20 @@
1212
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
1313

1414
use Symfony\Component\DependencyInjection\ServiceSubscriberInterface as LegacyServiceSubscriberInterface;
15+
use Symfony\Contracts\Service\ServiceSubscriberInterface;
1516

1617
if (interface_exists(LegacyServiceSubscriberInterface::class)) {
17-
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.legacy.php';
18+
/**
19+
* @internal
20+
*/
21+
interface CompatibilityServiceSubscriberInterface extends LegacyServiceSubscriberInterface
22+
{
23+
}
1824
} else {
19-
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.contracts.php';
25+
/**
26+
* @internal
27+
*/
28+
interface CompatibilityServiceSubscriberInterface extends ServiceSubscriberInterface
29+
{
30+
}
2031
}

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/CompatibilityServiceSubscriberInterface.contracts.php

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/CompatibilityServiceSubscriberInterface.legacy.php

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/CompatibilityServiceSubscriberInterface.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,20 @@
1212
namespace Symfony\Bundle\TwigBundle\DependencyInjection;
1313

1414
use Symfony\Component\DependencyInjection\ServiceSubscriberInterface as LegacyServiceSubscriberInterface;
15+
use Symfony\Contracts\Service\ServiceSubscriberInterface;
1516

1617
if (interface_exists(LegacyServiceSubscriberInterface::class)) {
17-
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.legacy.php';
18+
/**
19+
* @internal
20+
*/
21+
interface CompatibilityServiceSubscriberInterface extends LegacyServiceSubscriberInterface
22+
{
23+
}
1824
} else {
19-
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.contracts.php';
25+
/**
26+
* @internal
27+
*/
28+
interface CompatibilityServiceSubscriberInterface extends ServiceSubscriberInterface
29+
{
30+
}
2031
}

‎src/Symfony/Component/Cache/Exception/CacheException+psr16.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Symfony/Component/Cache/Exception/CacheException-psr16.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/Symfony/Component/Cache/Exception/CacheException.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111

1212
namespace Symfony\Component\Cache\Exception;
1313

14+
use Psr\Cache\CacheException as Psr6CacheInterface;
1415
use Psr\SimpleCache\CacheException as SimpleCacheInterface;
1516

1617
if (interface_exists(SimpleCacheInterface::class)) {
17-
require __DIR__.\DIRECTORY_SEPARATOR.'CacheException+psr16.php';
18+
class CacheException extends \Exception implements Psr6CacheInterface, SimpleCacheInterface
19+
{
20+
}
1821
} else {
19-
require __DIR__.\DIRECTORY_SEPARATOR.'CacheException-psr16.php';
22+
class CacheException extends \Exception implements Psr6CacheInterface
23+
{
24+
}
2025
}

‎src/Symfony/Component/Cache/Exception/InvalidArgumentException+psr16.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Symfony/Component/Cache/Exception/InvalidArgumentException-psr16.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/Symfony/Component/Cache/Exception/InvalidArgumentException.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111

1212
namespace Symfony\Component\Cache\Exception;
1313

14+
use Psr\Cache\InvalidArgumentException as Psr6CacheInterface;
1415
use Psr\SimpleCache\InvalidArgumentException as SimpleCacheInterface;
1516

1617
if (interface_exists(SimpleCacheInterface::class)) {
17-
require __DIR__.\DIRECTORY_SEPARATOR.'InvalidArgumentException+psr16.php';
18+
class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface, SimpleCacheInterface
19+
{
20+
}
1821
} else {
19-
require __DIR__.\DIRECTORY_SEPARATOR.'InvalidArgumentException-psr16.php';
22+
class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface
23+
{
24+
}
2025
}

‎src/Symfony/Component/Cache/Exception/LogicException+psr16.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Symfony/Component/Cache/Exception/LogicException-psr16.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/Symfony/Component/Cache/Exception/LogicException.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111

1212
namespace Symfony\Component\Cache\Exception;
1313

14-
use Psr\SimpleCache\LogicException as SimpleCacheInterface;
14+
use Psr\Cache\CacheException as Psr6CacheInterface;
15+
use Psr\SimpleCache\CacheException as SimpleCacheInterface;
1516

1617
if (interface_exists(SimpleCacheInterface::class)) {
17-
require __DIR__.\DIRECTORY_SEPARATOR.'LogicException+psr16.php';
18+
class LogicException extends \LogicException implements Psr6CacheInterface, SimpleCacheInterface
19+
{
20+
}
1821
} else {
19-
require __DIR__.\DIRECTORY_SEPARATOR.'LogicException-psr16.php';
22+
class LogicException extends \LogicException implements Psr6CacheInterface
23+
{
24+
}
2025
}

‎src/Symfony/Contracts/EventDispatcher/Event+psr14.php

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)