{{ 'error_help_desc'|trans }}
](http://godban.github.io/browsers-support-badges/)IE / Edge | [
](http://godban.github.io/browsers-support-badges/)Firefox | [
](http://godban.github.io/browsers-support-badges/)Chrome | [
](http://godban.github.io/browsers-support-badges/)Safari | [
](http://godban.github.io/browsers-support-badges/)iOS Safari | [
](http://godban.github.io/browsers-support-badges/)Samsung | [
](http://godban.github.io/browsers-support-badges/)Opera |
-| --------- | --------- | --------- | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions
The list of browsers being tested:
| [](http://godban.github.io/browsers-support-badges/)IE / Edge | [](http://godban.github.io/browsers-support-badges/)Firefox | [](http://godban.github.io/browsers-support-badges/)Chrome | [](http://godban.github.io/browsers-support-badges/)Chrome Android | [](http://godban.github.io/browsers-support-badges/)Safari | [](http://godban.github.io/browsers-support-badges/)iOS Safari |
-| --------- | --------- | --------- | --------- | --------- | --------- |
-| IE11, Edge last version| last version| last version| last version| last version| last version|
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| IE11, Edge last version | last version | last version | last version | last version | last version |
## Additional Documentation
@@ -250,17 +252,31 @@ Also, the following documentation can be found in the [docs][docs] directory:
1. [Release notes for releases < 5.0.0][docs-release-notes]
[qa-build]: https://github.com/OpenConext/OpenConext-engineblock/workflows/test-integration/badge.svg
+
[license]: LICENSE
+
[notice]: NOTICE.txt
+
[upgrading]: UPGRADING.md
+
[comp]: https://getcomposer.org/
+
[op-dev]: https://github.com/OpenConext/OpenConext-devconf
+
[manage]: https://github.com/OpenConext/OpenConext-manage
+
[eb-wiki-theme-development]: https://github.com/OpenConext/OpenConext-engineblock/wiki/Development-Guidelines#theme-development
+
[wiki]: https://github.com/OpenConext/OpenConext-engineblock/wiki
+
[wiki-development]: https://github.com/OpenConext/OpenConext-engineblock/wiki/Development-Guidelines
+
[docs]: https://github.com/OpenConext/OpenConext-engineblock/tree/master/docs/index.md
+
[docs-license]: https://github.com/OpenConext/OpenConext-engineblock/tree/master/docs/LICENSE
+
[docs-release]: https://github.com/OpenConext/OpenConext-engineblock/tree/master/docs/release_procedure.md
+
[docs-filter]: https://github.com/OpenConext/OpenConext-engineblock/tree/master/docs/filter_commands.md
+
[docs-release-notes]: https://github.com/OpenConext/OpenConext-engineblock/tree/master/docs/release_notes
diff --git a/UPGRADING.md b/UPGRADING.md
index 4827ff2fe0..6a789280be 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -1,5 +1,86 @@
# UPGRADE NOTES
+## 7.0.0
+Upgraded Symfony from **version 3.3** to **version 4.4 (LTS)**.
+This update brings modernized architecture, performance improvements, enhanced developer experience, and long-term support till November 2023.
+
+### Directory Structure Overhaul - technical changes:
+- The `app/` directory has been replaced with `config/` and `src/`
+- All configuration files now reside under [config/](config), organized by environment
+- Application configuration resides in [config/packages](config/packages)
+- The console has moved form `app/console` to [bin/console](bin/console)
+- Database migrations have moved to [migrations/](migrations)
+- `AppKernel` has been replaced with [Kernel](src/Kernel.php)
+- Logs has moved from `app/logs` to [var/log](var/log)
+- cache has moved from `app/cache` to [var/cache](var/cache)
+- The public access folder has changed from `web/` to [public/](public)
+- The entry point has changed from `app.php` to [index.php](public/index.php)
+- Some environment variables have changed.
+- [index.php](public/index.php) has been updated to load based on environment variables and has some additional environment variables checks.
+- All configurations injections from inside `src/` has been moved to `config/`
+
+### ⚠️ Breaking Changes - Configurational adjustments required:
+
+#### New public folder
+Replace `web/` with `public/`. Ensure the folder `public/` is accessible and your php webservice is pointing to `public/index.php`. In apache this would mean:
+
+```shell
+DocumentRoot /var/www/html/public
+a
b
"; + $expected = 'a
b
'; + $this->assertSame($expected, $this->extension->spaceless($input)); + } +} + diff --git a/tests/unit/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/WayfTest.php b/tests/unit/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/WayfTest.php index 43e8f58987..85ad48ec9a 100644 --- a/tests/unit/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/WayfTest.php +++ b/tests/unit/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/WayfTest.php @@ -37,7 +37,7 @@ class WayfTest extends TestCase protected function setUp(): void { $this->requestStack = $this->createMock(RequestStack::class); - $this->translator = $this->createMock(TranslatorInterface::class); + $this->translator = $this->createMock(\Symfony\Contracts\Translation\TranslatorInterface::class); $this->wayf = new Wayf($this->requestStack, $this->translator); } @@ -101,9 +101,7 @@ public static function previousSelectionProvider(): array ]; } - /** - * @dataProvider previousSelectionProvider - */ + #[\PHPUnit\Framework\Attributes\DataProvider('previousSelectionProvider')] public function testGetConnectedIdpsWithPreviousSelection(string $storedCookieValue, string $expectedName) { // Create a mock request with cookie diff --git a/tests/unit/OpenConext/EngineBlockBundle/Value/ExecutionTimeTest.php b/tests/unit/OpenConext/EngineBlockBundle/Value/ExecutionTimeTest.php index 7fbfc70d23..c42ef9a0bb 100644 --- a/tests/unit/OpenConext/EngineBlockBundle/Value/ExecutionTimeTest.php +++ b/tests/unit/OpenConext/EngineBlockBundle/Value/ExecutionTimeTest.php @@ -27,12 +27,9 @@ class ExecutionTimeTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @test - * @group execution-time - * - * @dataProvider \OpenConext\TestDataProvider::notInteger() - */ + #[\PHPUnit\Framework\Attributes\DataProviderExternal(\OpenConext\TestDataProvider::class, 'notInteger')] + #[\PHPUnit\Framework\Attributes\Group('execution-time')] + #[\PHPUnit\Framework\Attributes\Test] public function execution_time_in_milliseconds_can_only_be_an_integer($notInteger) { $this->expectException(InvalidArgumentException::class); @@ -40,10 +37,8 @@ public function execution_time_in_milliseconds_can_only_be_an_integer($notIntege ExecutionTime::of($notInteger); } - /** - * @test - * @group execution-time - */ + #[\PHPUnit\Framework\Attributes\Group('execution-time')] + #[\PHPUnit\Framework\Attributes\Test] public function execution_time_equals_a_given_other_execution_time() { $executionTime = ExecutionTime::of(1); @@ -54,10 +49,8 @@ public function execution_time_equals_a_given_other_execution_time() $this->assertTrue($areExecutionTimesTheSame); } - /** - * @test - * @group execution-time - */ + #[\PHPUnit\Framework\Attributes\Group('execution-time')] + #[\PHPUnit\Framework\Attributes\Test] public function execution_time_does_not_equal_a_given_other_execution_time() { $executionTime = ExecutionTime::of(1); @@ -68,10 +61,8 @@ public function execution_time_does_not_equal_a_given_other_execution_time() $this->assertFalse($areExecutionTimesTheSame); } - /** - * @test - * @group execution-time - */ + #[\PHPUnit\Framework\Attributes\Group('execution-time')] + #[\PHPUnit\Framework\Attributes\Test] public function execution_time_is_converted_to_microseconds() { $executionTime = ExecutionTime::of(1); diff --git a/tests/unit/OpenConext/EngineBlockBundle/Value/FeedbackInformationTest.php b/tests/unit/OpenConext/EngineBlockBundle/Value/FeedbackInformationTest.php index b7f4da382d..e1db3cc6e7 100644 --- a/tests/unit/OpenConext/EngineBlockBundle/Value/FeedbackInformationTest.php +++ b/tests/unit/OpenConext/EngineBlockBundle/Value/FeedbackInformationTest.php @@ -26,9 +26,7 @@ class FeedbackInformationTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @dataProvider attributePredictions - */ + #[\PHPUnit\Framework\Attributes\DataProvider('attributePredictions')] public function test_attr_safe_key_is_returned($identifier, $input, $expectation) { $feedbackInfo = new FeedbackInformation($input, 'Test value'); @@ -40,7 +38,7 @@ public function test_attr_safe_key_is_returned($identifier, $input, $expectation ); } - public function attributePredictions() + public static function attributePredictions() { return [ ['with whitespace', 'my attribute', 'my-attribute'], diff --git a/theme/base/templates/layouts/scripts/default.html.twig b/theme/base/templates/layouts/scripts/default.html.twig index 440c63c0ff..d9847d2a36 100644 --- a/theme/base/templates/layouts/scripts/default.html.twig +++ b/theme/base/templates/layouts/scripts/default.html.twig @@ -12,13 +12,13 @@{{ 'error_help_desc'|trans }}