Skip to content

Revert "minor #32054 Prepare for PHP 7.4 preload (nicolas-grekas)" #32110

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.

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 1 commit into from
Jun 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,20 @@
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;

use Symfony\Component\DependencyInjection\ServiceSubscriberInterface as LegacyServiceSubscriberInterface;
use Symfony\Contracts\Service\ServiceSubscriberInterface;

if (interface_exists(LegacyServiceSubscriberInterface::class)) {
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.legacy.php';
/**
* @internal
*/
interface CompatibilityServiceSubscriberInterface extends LegacyServiceSubscriberInterface
{
}
} else {
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.contracts.php';
/**
* @internal
*/
interface CompatibilityServiceSubscriberInterface extends ServiceSubscriberInterface
{
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,20 @@
namespace Symfony\Bundle\TwigBundle\DependencyInjection;

use Symfony\Component\DependencyInjection\ServiceSubscriberInterface as LegacyServiceSubscriberInterface;
use Symfony\Contracts\Service\ServiceSubscriberInterface;

if (interface_exists(LegacyServiceSubscriberInterface::class)) {
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.legacy.php';
/**
* @internal
*/
interface CompatibilityServiceSubscriberInterface extends LegacyServiceSubscriberInterface
{
}
} else {
require __DIR__.\DIRECTORY_SEPARATOR.'CompatibilityServiceSubscriberInterface.contracts.php';
/**
* @internal
*/
interface CompatibilityServiceSubscriberInterface extends ServiceSubscriberInterface
{
}
}
19 changes: 0 additions & 19 deletions src/Symfony/Component/Cache/Exception/CacheException+psr16.php

This file was deleted.

18 changes: 0 additions & 18 deletions src/Symfony/Component/Cache/Exception/CacheException-psr16.php

This file was deleted.

9 changes: 7 additions & 2 deletions src/Symfony/Component/Cache/Exception/CacheException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@

namespace Symfony\Component\Cache\Exception;

use Psr\Cache\CacheException as Psr6CacheInterface;
use Psr\SimpleCache\CacheException as SimpleCacheInterface;

if (interface_exists(SimpleCacheInterface::class)) {
require __DIR__.\DIRECTORY_SEPARATOR.'CacheException+psr16.php';
class CacheException extends \Exception implements Psr6CacheInterface, SimpleCacheInterface
{
}
} else {
require __DIR__.\DIRECTORY_SEPARATOR.'CacheException-psr16.php';
class CacheException extends \Exception implements Psr6CacheInterface
{
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@

namespace Symfony\Component\Cache\Exception;

use Psr\Cache\InvalidArgumentException as Psr6CacheInterface;
use Psr\SimpleCache\InvalidArgumentException as SimpleCacheInterface;

if (interface_exists(SimpleCacheInterface::class)) {
require __DIR__.\DIRECTORY_SEPARATOR.'InvalidArgumentException+psr16.php';
class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface, SimpleCacheInterface
{
}
} else {
require __DIR__.\DIRECTORY_SEPARATOR.'InvalidArgumentException-psr16.php';
class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface
{
}
}
19 changes: 0 additions & 19 deletions src/Symfony/Component/Cache/Exception/LogicException+psr16.php

This file was deleted.

18 changes: 0 additions & 18 deletions src/Symfony/Component/Cache/Exception/LogicException-psr16.php

This file was deleted.

11 changes: 8 additions & 3 deletions src/Symfony/Component/Cache/Exception/LogicException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@

namespace Symfony\Component\Cache\Exception;

use Psr\SimpleCache\LogicException as SimpleCacheInterface;
use Psr\Cache\CacheException as Psr6CacheInterface;
use Psr\SimpleCache\CacheException as SimpleCacheInterface;

if (interface_exists(SimpleCacheInterface::class)) {
require __DIR__.\DIRECTORY_SEPARATOR.'LogicException+psr16.php';
class LogicException extends \LogicException implements Psr6CacheInterface, SimpleCacheInterface
{
}
} else {
require __DIR__.\DIRECTORY_SEPARATOR.'LogicException-psr16.php';
class LogicException extends \LogicException implements Psr6CacheInterface
{
}
}
54 changes: 0 additions & 54 deletions src/Symfony/Contracts/EventDispatcher/Event+psr14.php

This file was deleted.

Loading