Merge pull request #20 from odiseoteam/1.3

Minor fixes
odiseoteam · Mar 18, 2024 · c1189ac · c1189ac
2 parents e74f211 + e94a32e
commit c1189ac
Show file tree

Hide file tree

Showing 28 changed files with 113 additions and 343 deletions.
diff --git a/.docker/nginx/nginx.conf b/.docker/nginx/nginx.conf
diff --git a/.docker/php/php.ini b/.docker/php/php.ini
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- php: ["8.0", "8.1", "8.2"]
+ php: ["8.0", "8.1"]
  symfony: ["5.4.*", "^6.0"]
  sylius: ["^1.12"]
  node: ["14.x", "16.x", "18.x"]

diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
   <img src="https://img.shields.io/packagist/v/odiseoteam/sylius-banner-plugin.svg" />
  </a>
  <a href="https://github.com/odiseoteam/SyliusBannerPlugin/actions" title="Build Status" target="_blank">
-  <img src="https://img.shields.io/github/workflow/status/odiseoteam/SyliusBannerPlugin/Build" />
+  <img src="https://img.shields.io/github/actions/workflow/status/odiseoteam/SyliusBannerPlugin/build.yml" />
  </a>
  <a href="https://scrutinizer-ci.com/g/odiseoteam/SyliusBannerPlugin/" title="Scrutinizer" target="_blank">
   <img src="https://img.shields.io/scrutinizer/g/odiseoteam/SyliusBannerPlugin.svg" />
@@ -21,7 +21,7 @@
  <a href="https://sylius-devs.slack.com" title="Slack" target="_blank">
   <img src="https://img.shields.io/badge/community%20chat-slack-FF1493.svg" />
  </a>
- <a href="https://odiseo.io/contact?utm_source=github&utm_medium=referral&utm_campaign=plugins_banner" title="Support" target="_blank">
+ <a href="https://odiseo.io/contact-us" title="Support" target="_blank">
   <img src="https://img.shields.io/badge/support-contact%20author-blue" />
  </a>
 </p>
@@ -37,7 +37,7 @@ Features:
 
 * Sliders: Provides sliders for the images ([Swiper](https://github.com/nolimits4web/swiper), [Glide](https://github.com/glidejs/glide), [SliderPro](https://github.com/bqworks/slider-pro)) or choose your own library.
 
-Support Sylius version 1.10+.
+Support Sylius version 1.9+.
 
 ## Screenshots
 

diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
  "phpspec/phpspec": "^7.2",
  "phpstan/extension-installer": "^1.0",
  "phpstan/phpstan": "^1.8.1",
- "phpstan/phpstan-doctrine": "1.3.37",
+ "phpstan/phpstan-doctrine": "1.3.40",
  "phpstan/phpstan-strict-rules": "^1.3.0",
  "phpstan/phpstan-webmozart-assert": "^1.2.0",
  "phpunit/phpunit": "^9.5",
@@ -43,10 +43,12 @@
  "symfony/flex": "^2.2.2",
  "symfony/intl": "^5.4 || ^6.0",
  "symfony/web-profiler-bundle": "^5.4 || ^6.0",
- "vimeo/psalm": "5.9.0"
+ "vimeo/psalm": "5.12.0"
  },
  "conflict": {
- "symfony/framework-bundle": "6.2.8"
+ "symfony/framework-bundle": "6.2.8",
+ "api-platform/core": "2.7.17",
+ "behat/mink-selenium2-driver": ">=1.7.0"
  },
  "config": {
  "sort-packages": true,

diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/psalm.xml b/psalm.xml
@@ -31,7 +31,5 @@
  <TooManyArguments errorLevel="info" />
  <MixedOperand errorLevel="info" />
  <MixedArrayAccess errorLevel="info" />
- <DeprecatedClass errorLevel="info" />
- <DeprecatedInterface errorLevel="info" />
  </issueHandlers>
 </psalm>
diff --git a/src/Block/SliderCssBlockListener.php b/src/Block/SliderCssBlockListener.php
@@ -9,12 +9,9 @@
 
 final class SliderCssBlockListener
 {
- private ?string $slider;
-
  public function __construct(
- ?string $slider
+ private ?string $slider,
  ) {
- $this->slider = $slider;
  }
 
  public function onBlockEvent(BlockEvent $event): void

diff --git a/src/Block/SliderJsBlockListener.php b/src/Block/SliderJsBlockListener.php
@@ -9,12 +9,9 @@
 
 final class SliderJsBlockListener
 {
- private ?string $slider;
-
  public function __construct(
- ?string $slider
+ private ?string $slider,
  ) {
- $this->slider = $slider;
  }
 
  public function onBlockEvent(BlockEvent $event): void

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -9,15 +9,15 @@
 
 final class Configuration implements ConfigurationInterface
 {
+ /**
+ * @psalm-suppress UndefinedMethod
+ */
  public function getConfigTreeBuilder(): TreeBuilder
  {
  $treeBuilder = new TreeBuilder('odiseo_sylius_banner_plugin');
 
  $rootNode = $treeBuilder->getRootNode();
 
- /**
- * @psalm-suppress UndefinedMethod
- */
  $rootNode
  ->children()
  ->scalarNode('slider')->defaultValue('swiper')->end()

diff --git a/src/Entity/Banner.php b/src/Entity/Banner.php
@@ -24,16 +24,13 @@ class Banner implements BannerInterface
  use ToggleableTrait;
 
  protected ?int $id = null;
+
  protected ?string $code = null;
 
- /**
- * @psalm-var Collection<array-key, ChannelInterface>
- */
+ /** @psalm-var Collection<array-key, ChannelInterface> */
  protected Collection $channels;
 
- /**
- * @psalm-var Collection<array-key, TaxonInterface>
- */
+ /** @psalm-var Collection<array-key, TaxonInterface> */
  protected Collection $taxons;
 
  public function __construct()

diff --git a/src/Entity/BannerTranslation.php b/src/Entity/BannerTranslation.php
@@ -13,13 +13,21 @@ class BannerTranslation extends AbstractTranslation implements BannerTranslation
  use TimestampableTrait;
 
  protected ?int $id = null;
+
  protected ?File $imageFile = null;
+
  protected ?string $imageName = null;
+
  protected ?File $mobileImageFile = null;
+
  protected ?string $mobileImageName = null;
+
  protected ?string $url = null;
+
  protected ?string $mainText = null;
+
  protected ?string $secondaryText = null;
+
  protected ?string $buttonText = null;
 
  public function __construct()