From 125bf70207aa5828589c2b40ae52435659776338 Mon Sep 17 00:00:00 2001 From: jakub Date: Wed, 19 Feb 2020 10:15:54 +0000 Subject: [PATCH 1/3] feat/allow symfony 4 --- .travis.yml | 12 +++++++----- DependencyInjection/Configuration.php | 2 +- Handler/DoctrineDBALHandler.php | 2 +- Makefile | 10 ++++++++++ Model/LogRepository.php | 2 +- Model/SchemaBuilder.php | 2 +- .../LexikMonologDoctrineExtensionTest.php | 4 ++-- composer.json | 8 +++++--- phpstan.neon | 5 +++++ 9 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 Makefile create mode 100644 phpstan.neon diff --git a/.travis.yml b/.travis.yml index c5b68ec..3638d29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,18 @@ language: php php: - - 5.6 - - 7.0 - 7.1 + - 7.2 + - 7.3 + - 7.4 env: - - SYMFONY_VERSION=2.8.* - - SYMFONY_VERSION=3.3.* + - SYMFONY_VERSION=4.4.* before_script: - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update - composer update --prefer-source -script: phpunit +script: + - make analysis + - make unit diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 709a41e..3b4c401 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -39,7 +39,7 @@ public function getConfigTreeBuilder() ->scalarNode('table_name')->defaultValue('monolog_entries')->end() ->scalarNode('connection_name')->end() ->arrayNode('connection') - ->cannotBeEmpty() + //->cannotBeEmpty() ->children() ->scalarNode('driver')->end() ->scalarNode('driverClass')->end() diff --git a/Handler/DoctrineDBALHandler.php b/Handler/DoctrineDBALHandler.php index c8ecbf7..0d4f314 100644 --- a/Handler/DoctrineDBALHandler.php +++ b/Handler/DoctrineDBALHandler.php @@ -32,7 +32,7 @@ class DoctrineDBALHandler extends AbstractProcessingHandler * @param Connection $connection * @param string $tableName * @param int $level - * @param string $bubble + * @param bool $bubble */ public function __construct(Connection $connection, $tableName, $level = Logger::DEBUG, $bubble = true) { diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2c68a8a --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +.PHONY: all +default: all; + +analysis: + vendor/bin/phpstan.phar analyse -c phpstan.neon -l 2 . + +unit: + vendor/bin/phpunit --no-coverage + +all: analysis unit \ No newline at end of file diff --git a/Model/LogRepository.php b/Model/LogRepository.php index 8a9ee6e..7bfbb9d 100644 --- a/Model/LogRepository.php +++ b/Model/LogRepository.php @@ -2,7 +2,7 @@ namespace Lexik\Bundle\MonologBrowserBundle\Model; -use Doctrine\DBAL\Driver\Connection; +use Doctrine\DBAL\Connection; use Lexik\Bundle\MonologBrowserBundle\Model\Log; diff --git a/Model/SchemaBuilder.php b/Model/SchemaBuilder.php index 9c50a46..7c9bf0b 100644 --- a/Model/SchemaBuilder.php +++ b/Model/SchemaBuilder.php @@ -2,7 +2,7 @@ namespace Lexik\Bundle\MonologBrowserBundle\Model; -use Doctrine\DBAL\Driver\Connection; +use Doctrine\DBAL\Connection; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\SchemaDiff; use Doctrine\DBAL\Schema\Comparator; diff --git a/Tests/DependencyInjection/LexikMonologDoctrineExtensionTest.php b/Tests/DependencyInjection/LexikMonologDoctrineExtensionTest.php index b586a6e..2e4f330 100644 --- a/Tests/DependencyInjection/LexikMonologDoctrineExtensionTest.php +++ b/Tests/DependencyInjection/LexikMonologDoctrineExtensionTest.php @@ -2,12 +2,12 @@ namespace Lexik\Bundle\MonologBrowserBundle\Tests\DependencyInjection; -use Symfony\Component\Yaml\Parser; +use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\ContainerBuilder; use Lexik\Bundle\MonologBrowserBundle\DependencyInjection\LexikMonologBrowserExtension; -class LexikMonologBrowserExtensionTest extends \PHPUnit_Framework_TestCase +class LexikMonologBrowserExtensionTest extends TestCase { public function testConfigLoad() { diff --git a/composer.json b/composer.json index 6b63fe6..d6dff26 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ } ], "require": { - "php": ">=5.6", - "symfony/framework-bundle": "^2.8|^3", + "php": ">=7.1", + "symfony/framework-bundle": "^4", "knplabs/knp-paginator-bundle": ">=2.3" }, "require-dev": { @@ -25,7 +25,9 @@ "doctrine/dbal": "*", "symfony/console": "^2.8|^3", "symfony/form": "^2.8|^3", - "symfony/options-resolver": "^2.8|^3" + "phpunit/phpunit": "^7", + "symfony/options-resolver": "^2.8|^3", + "phpstan/phpstan-shim": "^0.11" }, "autoload": { "psr-0": { "Lexik\\Bundle\\MonologBrowserBundle": "" } diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000..1936a01 --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,5 @@ +parameters: + excludes_analyse: + - %currentWorkingDirectory%/Tests/* + - %currentWorkingDirectory%/DependencyInjection/Configuration.php + - %currentWorkingDirectory%/vendor/* \ No newline at end of file From 8d0ffd7bc082adc2bb654ec3b9aae2998bf9e23c Mon Sep 17 00:00:00 2001 From: jakub Date: Wed, 19 Feb 2020 10:38:49 +0000 Subject: [PATCH 2/3] feat(symfony4): bump sumfony dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index d6dff26..64f79d6 100644 --- a/composer.json +++ b/composer.json @@ -23,10 +23,10 @@ "require-dev": { "monolog/monolog": "^1.24", "doctrine/dbal": "*", - "symfony/console": "^2.8|^3", - "symfony/form": "^2.8|^3", + "symfony/console": "^4", + "symfony/form": "^4", "phpunit/phpunit": "^7", - "symfony/options-resolver": "^2.8|^3", + "symfony/options-resolver": "^4", "phpstan/phpstan-shim": "^0.11" }, "autoload": { From b1bfa58ae9def6b51b052b52ec51dbe2ffbd2192 Mon Sep 17 00:00:00 2001 From: Octavio Antonelli Date: Fri, 27 Jan 2023 12:00:50 +0000 Subject: [PATCH 3/3] fix(sf4): stop getting repository service from container --- Controller/DefaultController.php | 30 ++++++++++++++++++------------ Resources/config/services.xml | 6 ++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php index 7ff8dfb..518d970 100644 --- a/Controller/DefaultController.php +++ b/Controller/DefaultController.php @@ -2,6 +2,7 @@ namespace Lexik\Bundle\MonologBrowserBundle\Controller; +use Lexik\Bundle\MonologBrowserBundle\Model\LogRepository; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; @@ -14,6 +15,19 @@ */ class DefaultController extends Controller { + /** + * @var LogRepository + */ + private $logRepository; + + /** + * DefaultController constructor. + */ + public function __construct(LogRepository $logRepository) + { + $this->logRepository = $logRepository; + } + /** * @param Request $request * @return \Symfony\Component\HttpFoundation\Response @@ -21,11 +35,11 @@ class DefaultController extends Controller public function indexAction(Request $request) { try { - $query = $this->getLogRepository()->getLogsQueryBuilder(); + $query = $this->logRepository->getLogsQueryBuilder(); $filter = $this->get('form.factory')->create(LogSearchType::class, null, array( 'query_builder' => $query, - 'log_levels' => $this->getLogRepository()->getLogsLevel(), + 'log_levels' => $this->logRepository->getLogsLevel(), )); $filter->submit($request->get($filter->getName())); @@ -55,13 +69,13 @@ public function indexAction(Request $request) */ public function showAction(Request $request, $id) { - $log = $this->getLogRepository()->getLogById($id); + $log = $this->logRepository->getLogById($id); if (null === $log) { throw $this->createNotFoundException('The log entry does not exist'); } - $similarLogsQuery = $this->getLogRepository()->getSimilarLogsQueryBuilder($log); + $similarLogsQuery = $this->logRepository->getSimilarLogsQueryBuilder($log); $similarLogs = $this->get('knp_paginator')->paginate( $similarLogsQuery, @@ -83,12 +97,4 @@ protected function getBaseLayout() { return $this->container->getParameter('lexik_monolog_browser.base_layout'); } - - /** - * @return \Lexik\Bundle\MonologBrowserBundle\Model\LogRepository - */ - protected function getLogRepository() - { - return $this->get('lexik_monolog_browser.model.log_repository'); - } } diff --git a/Resources/config/services.xml b/Resources/config/services.xml index a0b8c03..849f3ec 100644 --- a/Resources/config/services.xml +++ b/Resources/config/services.xml @@ -10,6 +10,8 @@ + + %lexik_monolog_browser.doctrine.table_name% @@ -19,5 +21,9 @@ %lexik_monolog_browser.doctrine.table_name% + + + +