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
25 changes: 4 additions & 21 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ framework:
adapter: cache.app
public: true
default_lifetime: 3600
cache.pool:
adapter: cache.app
public: true
mailer:
dsn: '%mailer.dsn%'
messenger:
Expand Down Expand Up @@ -158,27 +161,7 @@ services:
- [ execute, [ 'SET sql_mode = REPLACE(@@SESSION.sql_mode, "ONLY_FULL_GROUP_BY", "")'] ]
- [ setDebug, [ "%kernel.debug%" ]]
SpoonDatabase: '@database'
cache.filesystem.adapter:
class: League\Flysystem\Adapter\Local
arguments:
- "%kernel.cache_dir%"
cache.filesystem.filesystem:
class: League\Flysystem\Filesystem
arguments:
- "@cache.filesystem.adapter"
cache.adapter:
class: MatthiasMullie\Scrapbook\Adapters\Flysystem
arguments:
- "@cache.filesystem.filesystem"
cache.buffer:
class: MatthiasMullie\Scrapbook\Buffered\BufferedStore
arguments:
- "@cache.adapter"
cache.pool:
class: MatthiasMullie\Scrapbook\Psr6\Pool
public: true
arguments:
- "@cache.buffer"

cache.backend_navigation:
class: Backend\Core\Engine\NavigationCache
public: true
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"mailmotor/campaignmonitor-bundle": "^3.0",
"mailmotor/mailchimp-bundle": "^4.0",
"mailmotor/mailmotor-bundle": "^4.0",
"matthiasmullie/scrapbook": "^1.3",
"pimple/pimple": "^3.2",
"spoon/library": "^4.0",
"symfony/monolog-bundle": "^3.1",
Expand Down Expand Up @@ -57,7 +56,8 @@
"twig/cssinliner-extra": "^3.23",
"twig/string-extra": "^3.23",
"twig/inky-extra": "^3.23",
"symfony/uid": "^5.4"
"symfony/uid": "^5.4",
"symfony/cache": "^5.4"
},
"require-dev": {
"jdorn/sql-formatter": "1.2.17",
Expand Down
11 changes: 5 additions & 6 deletions src/Common/Tests/ModulesSettingsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
namespace Common\Tests;

use Common\ModulesSettings;
use MatthiasMullie\Scrapbook\Adapters\MemoryStore;
use MatthiasMullie\Scrapbook\Psr6\Pool;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Cache\Adapter\ArrayAdapter;

/**
* Tests for our module settings
Expand All @@ -17,7 +16,7 @@ public function testFetchingSettingsCallsTheDatabaseOnce(): void
{
$modulesSettings = new ModulesSettings(
$this->getDatabaseMock(),
new Pool(new MemoryStore())
new ArrayAdapter()
);

$modulesSettings->get('Core', 'theme', 'Fork');
Expand All @@ -28,7 +27,7 @@ public function testFetchingSettingWorks(): void
{
$modulesSettings = new ModulesSettings(
$this->getDatabaseMock(),
new Pool(new MemoryStore())
new ArrayAdapter()
);

self::assertEquals(
Expand All @@ -45,7 +44,7 @@ public function testDefaultValueWillBeReturned(): void
{
$modulesSettings = new ModulesSettings(
$this->getDatabaseMock(),
new Pool(new MemoryStore())
new ArrayAdapter()
);

self::assertEquals(
Expand All @@ -58,7 +57,7 @@ public function testFetchingSettingsForAModule(): void
{
$modulesSettings = new ModulesSettings(
$this->getDatabaseMock(),
new Pool(new MemoryStore())
new ArrayAdapter()
);

self::assertEquals(
Expand Down
Loading