From 999d645a339cc42ebb0c2697898120233c834254 Mon Sep 17 00:00:00 2001 From: Tatevik Date: Sat, 14 Dec 2024 16:51:21 +0400 Subject: [PATCH] ISSUE-337: changelog + test --- CHANGELOG.md | 6 + composer.json | 28 +- composer.lock | 243 ++++++------------ .../System/HttpEndpoints/WebFrontEndTest.php | 5 +- 4 files changed, 97 insertions(+), 185 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f25754..637ae07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,12 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Fixed - Security update for symfony/symfony and symfony/dependency-injection (#86) + +## 5.0.0-alpha1 + +### Changed +- php version 8.1 + ## 4.0.0-alpha2 ### Added diff --git a/composer.json b/composer.json index 10e6a96..4a17483 100755 --- a/composer.json +++ b/composer.json @@ -22,29 +22,6 @@ "role": "Former developer" } ], - "repositories": [ - { - "type": "path", - "url": "../core", - "options": { - "symlink": true - } - }, - { - "type": "path", - "url": "../rest-api", - "options": { - "symlink": true - } - }, - { - "type": "path", - "url": "../web-frontend", - "options": { - "symlink": true - } - } - ], "support": { "issues": "https://github.com/phpList/base-distribution/issues", "forum": "https://discuss.phplist.org/", @@ -54,7 +31,8 @@ "php": "^8.1", "phplist/core": "dev-ISSUE-337", "phplist/rest-api": "dev-ISSUE-337", - "phplist/web-frontend": "dev-ISSUE-337" + "phplist/web-frontend": "dev-ISSUE-337", + "doctrine/orm": "^3.3" }, "require-dev": { "phpunit/phpunit": "^9.5.2", @@ -109,7 +87,7 @@ }, "extra": { "branch-alias": { - "dev-ISSUE-337": "v5.0.x-dev" + "dev-ISSUE-337": "5.0.x-dev" }, "symfony-app-dir": "bin", "symfony-bin-dir": "bin", diff --git a/composer.lock b/composer.lock index 8269e59..3d429f2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "62ff6793c3373c9c3d3b6ac0671e7afb", + "content-hash": "d9aa8969ea856955c641822420e29b89", "packages": [ { "name": "doctrine/cache", @@ -2088,14 +2088,22 @@ { "name": "phplist/core", "version": "dev-ISSUE-337", + "source": { + "type": "git", + "url": "https://github.com/phpList/core.git", + "reference": "411f8f08de08edd94bbed2d9036181af9f84d166" + }, "dist": { - "type": "path", - "url": "../core", - "reference": "46df22f9cdf8a3add47731e4becfb1c8734a6a1a" + "type": "zip", + "url": "https://api.github.com/repos/phpList/core/zipball/411f8f08de08edd94bbed2d9036181af9f84d166", + "reference": "411f8f08de08edd94bbed2d9036181af9f84d166", + "shasum": "" }, "require": { + "doctrine/cache": "^2.2", "doctrine/doctrine-fixtures-bundle": "^3.7", "doctrine/instantiator": "^2.0", + "doctrine/orm": "^3.3", "masterminds/html5": "^2.9", "php": "^8.1", "symfony/asset": "^6.4", @@ -2135,60 +2143,34 @@ "type": "phplist-module", "extra": { "branch-alias": { - "dev-master": "5.0.x-dev" + "dev-ISSUE-337": "5.0.x-dev" }, - "symfony-app-dir": "", - "symfony-bin-dir": "bin", - "symfony-var-dir": "var", - "symfony-web-dir": "public", - "symfony-tests-dir": "tests", "phplist/core": { + "routes": { + "homepage": { + "type": "attribute", + "resource": "@EmptyStartPageBundle/Controller/" + } + }, "bundles": [ "Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle", "Symfony\\Bundle\\MonologBundle\\MonologBundle", "Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle", "PhpList\\Core\\EmptyStartPageBundle\\EmptyStartPageBundle" - ], - "routes": { - "homepage": { - "resource": "@EmptyStartPageBundle/Controller/", - "type": "attribute" - } - } - } + ] + }, + "symfony-app-dir": "", + "symfony-bin-dir": "bin", + "symfony-var-dir": "var", + "symfony-web-dir": "public", + "symfony-tests-dir": "tests" }, "autoload": { "psr-4": { "PhpList\\Core\\": "src/" } }, - "autoload-dev": { - "psr-4": { - "PhpList\\Core\\Tests\\": "tests/" - } - }, - "scripts": { - "list-modules": [ - "PhpList\\Core\\Composer\\ScriptHandler::listModules" - ], - "update-configuration": [ - "PhpList\\Core\\Composer\\ScriptHandler::createGeneralConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration", - "php bin/console cache:clear", - "php bin/console cache:warmup" - ], - "post-install-cmd": [ - "@update-configuration" - ], - "post-update-cmd": [ - "@update-configuration" - ], - "run-php-documentor": [ - "phpDocumentor -d 'src,tests'" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "AGPL-3.0-or-later" ], @@ -2218,23 +2200,26 @@ "phplist" ], "support": { - "issues": "https://github.com/phpList/core/issues", "forum": "https://discuss.phplist.org/", - "wiki": "https://github.com/phpList/core/wiki", - "source": "https://github.com/phpList/core" + "issues": "https://github.com/phpList/core/issues", + "source": "https://github.com/phpList/core", + "wiki": "https://github.com/phpList/core/wiki" }, - "transport-options": { - "symlink": true, - "relative": true - } + "time": "2024-12-16T18:36:37+00:00" }, { "name": "phplist/rest-api", "version": "dev-ISSUE-337", + "source": { + "type": "git", + "url": "https://github.com/phpList/rest-api.git", + "reference": "2ce9ae1179a6aa816c3da08ff817f2daedfe96ce" + }, "dist": { - "type": "path", - "url": "../rest-api", - "reference": "2e8300a61c70335644f943af5ecf9bd22b4aafcc" + "type": "zip", + "url": "https://api.github.com/repos/phpList/rest-api/zipball/2ce9ae1179a6aa816c3da08ff817f2daedfe96ce", + "reference": "2ce9ae1179a6aa816c3da08ff817f2daedfe96ce", + "shasum": "" }, "require": { "friendsofsymfony/rest-bundle": "*", @@ -2257,64 +2242,33 @@ "type": "phplist-module", "extra": { "branch-alias": { - "dev-master": "5.0.x-dev" + "dev-ISSUE-337": "5.0.x-dev" }, - "symfony-app-dir": "bin", - "symfony-bin-dir": "bin", - "symfony-var-dir": "var", - "symfony-web-dir": "public", - "symfony-tests-dir": "tests", "phplist/core": { - "bundles": [ - "FOS\\RestBundle\\FOSRestBundle", - "PhpList\\RestBundle\\PhpListRestBundle" - ], "routes": { "rest-api": { - "resource": "@PhpListRestBundle/Controller/", "type": "attribute", - "prefix": "/api/v2" + "prefix": "/api/v2", + "resource": "@PhpListRestBundle/Controller/" } - } - } + }, + "bundles": [ + "FOS\\RestBundle\\FOSRestBundle", + "PhpList\\RestBundle\\PhpListRestBundle" + ] + }, + "symfony-app-dir": "bin", + "symfony-bin-dir": "bin", + "symfony-var-dir": "var", + "symfony-web-dir": "public", + "symfony-tests-dir": "tests" }, "autoload": { "psr-4": { "PhpList\\RestBundle\\": "src/" } }, - "autoload-dev": { - "psr-4": { - "PhpList\\RestBundle\\Tests\\": "tests/" - } - }, - "scripts": { - "list-modules": [ - "PhpList\\Core\\Composer\\ScriptHandler::listModules" - ], - "create-directories": [ - "PhpList\\Core\\Composer\\ScriptHandler::createBinaries", - "PhpList\\Core\\Composer\\ScriptHandler::createPublicWebDirectory" - ], - "update-configuration": [ - "PhpList\\Core\\Composer\\ScriptHandler::createGeneralConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::clearAllCaches" - ], - "post-install-cmd": [ - "@create-directories", - "@update-configuration" - ], - "post-update-cmd": [ - "@create-directories", - "@update-configuration" - ], - "openapi-generate": [ - "vendor/bin/openapi -o docs/openapi.json --format json src" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "AGPL-3.0-or-later" ], @@ -2341,22 +2295,25 @@ "rest" ], "support": { - "issues": "https://github.com/phpList/rest-api/issues", "forum": "https://discuss.phplist.org/", + "issues": "https://github.com/phpList/rest-api/issues", "source": "https://github.com/phpList/rest-api" }, - "transport-options": { - "symlink": true, - "relative": true - } + "time": "2024-12-16T16:02:13+00:00" }, { "name": "phplist/web-frontend", "version": "dev-ISSUE-337", + "source": { + "type": "git", + "url": "https://github.com/phpList/web-frontend.git", + "reference": "a3e3f93718ec18402022dca229787998719e33e3" + }, "dist": { - "type": "path", - "url": "../web-frontend", - "reference": "ff1e96cce59713f46fb4a5d93faa174a810de7f5" + "type": "zip", + "url": "https://api.github.com/repos/phpList/web-frontend/zipball/a3e3f93718ec18402022dca229787998719e33e3", + "reference": "a3e3f93718ec18402022dca229787998719e33e3", + "shasum": "" }, "require": { "php": "^8.1", @@ -2367,60 +2324,32 @@ "nette/caching": "^3.1.0", "nikic/php-parser": "^v4.10.4", "phpmd/phpmd": "^2.9.1", - "phpstan/phpstan": " ^0.12.57", - "phpunit/phpunit": "^9.5.2", - "phpunit/phpunit-mock-objects": "^6.1.2", - "squizlabs/php_codesniffer": "^3.5.8" + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.5", + "squizlabs/php_codesniffer": "^3.5.8", + "symfony/process": "^6.4" }, "type": "phplist-module", "extra": { "branch-alias": { - "dev-master": "5.0.x-dev" + "dev-ISSUE-337": "5.0.x-dev" + }, + "phplist/core": { + "routes": [], + "bundles": [] }, "symfony-app-dir": "bin", "symfony-bin-dir": "bin", "symfony-var-dir": "var", "symfony-web-dir": "public", - "symfony-tests-dir": "tests", - "phplist/core": { - "bundles": [], - "routes": [] - } + "symfony-tests-dir": "tests" }, "autoload": { "psr-4": { "PhpList\\WebFrontend\\": "src/" } }, - "autoload-dev": { - "psr-4": { - "PhpList\\WebFrontend\\Tests\\": "tests/" - } - }, - "scripts": { - "list-modules": [ - "PhpList\\Core\\Composer\\ScriptHandler::listModules" - ], - "create-directories": [ - "PhpList\\Core\\Composer\\ScriptHandler::createBinaries", - "PhpList\\Core\\Composer\\ScriptHandler::createPublicWebDirectory" - ], - "update-configuration": [ - "PhpList\\Core\\Composer\\ScriptHandler::createGeneralConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration", - "PhpList\\Core\\Composer\\ScriptHandler::clearAllCaches" - ], - "post-install-cmd": [ - "@create-directories", - "@update-configuration" - ], - "post-update-cmd": [ - "@create-directories", - "@update-configuration" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "AGPL-3.0-or-later" ], @@ -2446,14 +2375,11 @@ "phplist" ], "support": { - "issues": "https://github.com/phpList/web-frontend/issues", "forum": "https://discuss.phplist.org/", + "issues": "https://github.com/phpList/web-frontend/issues", "source": "https://github.com/phpList/web-frontend" }, - "transport-options": { - "symlink": true, - "relative": true - } + "time": "2024-12-16T16:49:16+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -9375,12 +9301,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "782fdf596581968ada24d6b3137cc622d08a5bbc" + "reference": "233f7c395ac3b83e3c85aa304f3350bf8897aca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/782fdf596581968ada24d6b3137cc622d08a5bbc", - "reference": "782fdf596581968ada24d6b3137cc622d08a5bbc", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/233f7c395ac3b83e3c85aa304f3350bf8897aca5", + "reference": "233f7c395ac3b83e3c85aa304f3350bf8897aca5", "shasum": "" }, "conflict": { @@ -9704,6 +9630,7 @@ "laravel/fortify": "<1.11.1", "laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31", "laravel/laravel": ">=5.4,<5.4.22", + "laravel/pulse": "<1.3.1", "laravel/reverb": "<1.4", "laravel/socialite": ">=1,<2.0.10", "latte/latte": "<2.10.8", @@ -9967,7 +9894,7 @@ "snipe/snipe-it": "<=7.0.13", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", - "spatie/browsershot": "<3.57.4", + "spatie/browsershot": "<5.0.1", "spatie/image-optimizer": "<1.7.3", "spencer14420/sp-php-email-handler": "<1", "spipu/html2pdf": "<5.2.8", @@ -10218,7 +10145,7 @@ "type": "tidelift" } ], - "time": "2024-12-12T20:05:59+00:00" + "time": "2024-12-13T21:04:51+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/tests/System/HttpEndpoints/WebFrontEndTest.php b/tests/System/HttpEndpoints/WebFrontEndTest.php index cdf9e86..2b4833c 100644 --- a/tests/System/HttpEndpoints/WebFrontEndTest.php +++ b/tests/System/HttpEndpoints/WebFrontEndTest.php @@ -44,8 +44,9 @@ public function testHomepageReturnsSuccess() public function testHomepageReturnsContent() { - self::getClient()->request('get', '/'); + self::getClient()->request('get', '/api/v2'); + $response = self::getClient()->getResponse(); - self::assertNotEmpty(json_decode(self::getClient()->getResponse()->getContent(), true)); + self::assertNotEmpty($response->getContent()); } }