Skip to content
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
24 changes: 0 additions & 24 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
<file src="src/Command/DeprecatedStorageFactoryConfigurationCheckCommand.php">
<MixedArgument>
<code><![CDATA[$cacheConfiguration]]></code>
<code><![CDATA[$configuration]]></code>
</MixedArgument>
<MixedPropertyTypeCoercion>
<code><![CDATA[$projectConfiguration]]></code>
</MixedPropertyTypeCoercion>
</file>
<file src="src/Exception/BadMethodCallException.php">
<UnusedClass>
<code><![CDATA[BadMethodCallException]]></code>
Expand Down Expand Up @@ -352,15 +343,6 @@
<code><![CDATA[TotalSpaceCapableInterface]]></code>
</UnusedClass>
</file>
<file src="test/Command/DeprecatedStorageFactoryConfigurationCheckCommandTest.php">
<DeprecatedMethod>
<code><![CDATA[withConsecutive]]></code>
<code><![CDATA[withConsecutive]]></code>
<code><![CDATA[withConsecutive]]></code>
<code><![CDATA[withConsecutive]]></code>
<code><![CDATA[withConsecutive]]></code>
</DeprecatedMethod>
</file>
<file src="test/Pattern/AbstractCommonPatternTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[getCommonPatternNamesProvider]]></code>
Expand Down Expand Up @@ -483,12 +465,6 @@
<code><![CDATA[array]]></code>
</MixedInferredReturnType>
</file>
<file src="test/Service/DeprecatedSchemaDetectorTest.php">
<MixedInferredReturnType>
<code><![CDATA[Generator]]></code>
<code><![CDATA[Generator]]></code>
</MixedInferredReturnType>
</file>
<file src="test/Service/StorageAdapterFactoryFactoryTest.php">
<DeprecatedMethod>
<code><![CDATA[withConsecutive]]></code>
Expand Down
141 changes: 0 additions & 141 deletions src/Command/DeprecatedStorageFactoryConfigurationCheckCommand.php

This file was deleted.

This file was deleted.

36 changes: 2 additions & 34 deletions src/ConfigProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,18 @@

namespace Laminas\Cache;

use Laminas\Cache\Command\DeprecatedStorageFactoryConfigurationCheckCommand;
use Laminas\Cache\Command\DeprecatedStorageFactoryConfigurationCheckCommandFactory;
use Laminas\Cache\Service\StorageAdapterFactory;
use Laminas\Cache\Service\StorageAdapterFactoryFactory;
use Laminas\Cache\Service\StorageAdapterFactoryInterface;
use Laminas\Cache\Service\StoragePluginFactory;
use Laminas\Cache\Service\StoragePluginFactoryFactory;
use Laminas\Cache\Service\StoragePluginFactoryInterface;
use Laminas\ServiceManager\ServiceManager;
use Symfony\Component\Console\Command\Command;

use function class_exists;

/**
* @psalm-import-type ServiceManagerConfiguration from ServiceManager
*/
class ConfigProvider
final class ConfigProvider
{
public const ADAPTER_PLUGIN_MANAGER_CONFIGURATION_KEY = 'storage_adapters';

Expand All @@ -31,7 +26,6 @@ public function __invoke(): array
{
return [
'dependencies' => $this->getDependencyConfig(),
'laminas-cli' => $this->getCliConfig(),
];
}

Expand All @@ -42,7 +36,7 @@ public function __invoke(): array
*/
public function getDependencyConfig(): array
{
$dependencies = [
return [
'abstract_factories' => [
Service\StorageCacheAbstractServiceFactory::class,
],
Expand All @@ -55,31 +49,5 @@ public function getDependencyConfig(): array
StorageAdapterFactoryInterface::class => StorageAdapterFactoryFactory::class,
],
];

if (class_exists(Command::class)) {
$dependencies['factories'] += [
DeprecatedStorageFactoryConfigurationCheckCommand::class
=> DeprecatedStorageFactoryConfigurationCheckCommandFactory::class,
];
}

return $dependencies;
}

/**
* @return array<string,mixed>
*/
public function getCliConfig(): array
{
if (! class_exists(Command::class)) {
return [];
}

return [
'commands' => [
DeprecatedStorageFactoryConfigurationCheckCommand::NAME
=> DeprecatedStorageFactoryConfigurationCheckCommand::class,
],
];
}
}
3 changes: 1 addition & 2 deletions src/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Laminas\Cache;

class Module
final class Module
{
/**
* Return default laminas-cache configuration for laminas-mvc context.
Expand All @@ -12,7 +12,6 @@ public function getConfig(): array
$provider = new ConfigProvider();
return [
'service_manager' => $provider->getDependencyConfig(),
'laminas-cli' => $provider->getCliConfig(),
];
}
}
41 changes: 0 additions & 41 deletions src/Service/DeprecatedSchemaDetector.php

This file was deleted.

16 changes: 0 additions & 16 deletions src/Service/DeprecatedSchemaDetectorInterface.php

This file was deleted.

Loading