Skip to content
Closed
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
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,23 @@
}
},
"require": {
"php": "~8.2.0 || ~8.3.0 || ~8.4",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"ext-sockets": "*",
"clue/socket-raw": "^v1.6.0",
"dotkernel/dot-cache": "^4.3",
"dotkernel/dot-cli": "^3.9",
"dotkernel/dot-data-fixtures": "^1.4.0",
"dotkernel/dot-dependency-injection": "^1.2",
"dotkernel/dot-log": "4.0.4",
"dotkernel/dot-log": "4.1.0",
"dotkernel/dot-mail": "^5.3.0",
"dotkernel/dot-twigrenderer": "3.6.0",
"laminas/laminas-authentication": "2.18.0",
"laminas/laminas-component-installer": "^3.5",
"laminas/laminas-config-aggregator": "^1.18",
"mezzio/mezzio": "^3.20",
"mezzio/mezzio-authentication-oauth2": "^2.11",
"mezzio/mezzio-twigrenderer": "2.17.0",
"netglue/laminas-messenger": "^2.3.0",
"psr-mock/http-message-implementation": "^1.0 || ^2.0",
"ramsey/uuid": "^4.5.0",
"ramsey/uuid-doctrine": "^2.1.0",
"roave/psr-container-doctrine": "^5.2.2",
Expand Down
10 changes: 1 addition & 9 deletions config/autoload/templates.global.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

declare(strict_types=1);

use Dot\Twig\Extension\DateExtension;
use Dot\Twig\Extension\TranslationExtension;
use Laminas\ServiceManager\Factory\InvokableFactory;
use Mezzio\Template\TemplateRendererInterface;
use Mezzio\Twig\TwigEnvironmentFactory;
use Mezzio\Twig\TwigRendererFactory;
Expand All @@ -13,10 +10,8 @@
return [
'dependencies' => [
'factories' => [
DateExtension::class => InvokableFactory::class,
Environment::class => TwigEnvironmentFactory::class,
TemplateRendererInterface::class => TwigRendererFactory::class,
TranslationExtension::class => InvokableFactory::class,
],
],
'debug' => false,
Expand All @@ -29,10 +24,7 @@
'auto_reload' => true,
'autoescape' => 'html',
'cache_dir' => 'data/cache/twig',
'extensions' => [
DateExtension::class,
TranslationExtension::class,
],
'extensions' => [],
'globals' => [
'appName' => $app['name'] ?? '',
],
Expand Down
1 change: 0 additions & 1 deletion config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
Dot\DataFixtures\ConfigProvider::class,
Dot\DependencyInjection\ConfigProvider::class,
Dot\Mail\ConfigProvider::class,
Dot\Twig\ConfigProvider::class,
Dot\Cache\ConfigProvider::class,

// Core modules
Expand Down
8 changes: 1 addition & 7 deletions src/Core/src/App/src/InputFilter/AbstractInputFilter.php
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By removing these docblocks PHPStan will fail in the other projects implementing the Core architecture.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we are in a catch 22 here ...
In order to move forward with this project, we need to accept this hack as is
and one laminas_inputfilter will be released and laminas-session, and then will use back dot-twigrendered and fix this issue
We agreed that in practice, the Core submodule will have different branches
This modification is like an compatibility branch

Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

namespace Core\App\InputFilter;

use Laminas\InputFilter\InputFilter;

/**
* @template TFilteredValues
* @extends InputFilter<TFilteredValues>
*/
abstract class AbstractInputFilter extends InputFilter
abstract class AbstractInputFilter
{
}
Loading