Commit 6ff3e9dc authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'feature_fichiers' into release_10.1.0

parents b3ba1c99 4d78a634
Loading
Loading
Loading
Loading
+4 −0
Changes for CHANGELOG.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
Journal des modifications
=========================
10.0.3
-----
- [FIX] Génération du document pour signature pour la présidence (proposition de soutenance) était possible même sans la validation préalable des autres acteurs
- [FIX] Proposition de soutenance bloquée lorsque tous les avis étaient défavorables 

10.1.0
------
+27 −0
Changes for module/Application/config/others/search.config.php: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application;

use Application\Search\Filter\SearchFilterPluginManager;
use Application\Search\Filter\SearchFilterPluginManagerFactory;
use Application\Search\SearchServicePluginManager;
use Application\Search\SearchServicePluginManagerFactory;

return [
    'service_manager' => [
        'factories' => [
            SearchServicePluginManager::class => SearchServicePluginManagerFactory::class,
            SearchFilterPluginManager::class => SearchFilterPluginManagerFactory::class,
        ],
    ],
    'search_services' => [
        'factories' => [
            // Any module providing additional search services would use this config array.
        ],
    ],
    'search_filters' => [
        'factories' => [
            // Any module providing additional search filters would use this config array.
        ],
    ],
];
 No newline at end of file
+20 −0
Changes for module/Application/src/Application/Search/Filter/SearchFilterPluginManager.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Search\Filter;

use Laminas\ServiceManager\AbstractPluginManager;
use Laminas\ServiceManager\Factory\InvokableFactory;

class SearchFilterPluginManager extends AbstractPluginManager
{
    protected $instanceOf = SearchFilter::class;

    protected $factories = [
        CheckboxSearchFilter::class => InvokableFactory::class,
        StrReducedTextSearchFilter::class => InvokableFactory::class,
        TextCriteriaSearchFilter::class => InvokableFactory::class,
        TextSearchFilter::class => InvokableFactory::class,
        WhereSearchFilter::class => InvokableFactory::class,
//        EstHistoriseSearchFilter::class => InvokableFactory::class,
    ];
}
 No newline at end of file
+8 −0
Changes for module/Application/src/Application/Search/Filter/SearchFilterPluginManagerAwareInterface.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Search\Filter;

interface SearchFilterPluginManagerAwareInterface
{
    public function setSearchFilterPluginManager(SearchFilterPluginManager $searchFilterPluginManager);
}
 No newline at end of file
+36 −0
Changes for module/Application/src/Application/Search/Filter/SearchFilterPluginManagerFactory.php: 36 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Search\Filter;

use Laminas\ServiceManager\Config;
use Laminas\ServiceManager\Factory\FactoryInterface;
use Psr\Container\ContainerInterface;

class SearchFilterPluginManagerFactory implements FactoryInterface
{
    /**
     * @throws \Psr\Container\ContainerExceptionInterface
     * @throws \Psr\Container\NotFoundExceptionInterface
     */
    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): SearchFilterPluginManager
    {
        $pluginManager = new SearchFilterPluginManager($container, $options ?: []);

        // If we do not have a config service, nothing more to do
        if (! $container->has('config')) {
            return $pluginManager;
        }

        $config = $container->get('config');

        // If we do not have validators configuration, nothing more to do
        if (! isset($config['search_filters']) || ! is_array($config['search_filters'])) {
            return $pluginManager;
        }

        // Wire service configuration for search filters
        (new Config($config['search_filters']))->configureServiceManager($pluginManager);

        return $pluginManager;
    }
}
 No newline at end of file
Loading