Skip to content

Commit 16ff6ee

Browse files
fabpotfabpot
committed
Merge branch '4.4'
* 4.4: Revert "minor #32054 Prepare for PHP 7.4 preload (nicolas-grekas)"
2 parents 409ccd1 + dca9325 commit 16ff6ee

15 files changed

+140
-296
lines changed

‎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)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy