Merge pull request #13 from stevro/migrate_sf7

Migrate sf7
stevro · Sep 16, 2024 · 813c9ea · 813c9ea
2 parents b03f64a + b066f30
commit 813c9ea
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 224 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -16,12 +16,12 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('stev_lista_firme');
+        $treeBuilder = new TreeBuilder('stev_lista_firme');
+        $rootNode = $treeBuilder->getRootNode();
 
-        $supportedCheckers = array(CIFChecker::CHECKER_LISTA_FIRME, CIFChecker::CHECKER_MFIN, CIFChecker::CHECKER_OPEN_API, CIFChecker::CHECKER_ANAF, CIFChecker::CHECKER_VIES);
+        $supportedCheckers = array(CIFChecker::CHECKER_LISTA_FIRME, CIFChecker::CHECKER_OPEN_API, CIFChecker::CHECKER_ANAF, CIFChecker::CHECKER_VIES);
 
         $rootNode
                 ->children()

diff --git a/DependencyInjection/StevListaFirmeExtension.php b/DependencyInjection/StevListaFirmeExtension.php
@@ -31,11 +31,6 @@ public function load(array $configs, ContainerBuilder $container)
                     throw new \RuntimeException('Username and password are mandatory for listaFirme checker');
                 }
                 break;
-            case \Stev\ListaFirmeBundle\Lib\CIFChecker::CHECKER_MFIN:
-                if (!isset($config['pathToPhantom'])) {
-                    $config['pathToPhantom'] = $container->getParameter('kernel.root_dir') . '/../bin/phantomjs';
-                }
-                break;
             case \Stev\ListaFirmeBundle\Lib\CIFChecker::CHECKER_OPEN_API:
                 if (!isset($config['apiKey'])) {
                     throw new \RuntimeException('ApiKey is mandatory for OpenAPI checker since 15.09.2016');

diff --git a/Lib/CIFChecker.php b/Lib/CIFChecker.php
@@ -16,7 +16,6 @@ class CIFChecker
 {
 
     const CHECKER_LISTA_FIRME = 'listaFirme';
-    const CHECKER_MFIN = 'mFin';
     const CHECKER_OPEN_API = 'openApi';
     const CHECKER_ANAF = 'anaf';
     const CHECKER_VIES = 'vies';
@@ -42,7 +41,7 @@ class CIFChecker
      * @param bool $enabled If you set it to false it will completly disable the checker.
      * @param LoggerInterface
      */
-    public function __construct($cifChecker, $username, $password, $offline = false, $enabled = true, $pathToPhantom = null, \Psr\Log\LoggerInterface $logger, $apiKey = null)
+    public function __construct($cifChecker, $username, $password, \Psr\Log\LoggerInterface $logger, $offline = false, $enabled = true, $apiKey = null)
     {
         $this->logger = $logger;
 
@@ -51,7 +50,6 @@ public function __construct($cifChecker, $username, $password, $offline = false,
             'password' => $password,
             'offline' => $offline,
             'enabled' => $enabled,
-            'pathToPhantom' => $pathToPhantom,
             'logger' => $logger,
             'apiKey' => $apiKey,
         ];
@@ -60,9 +58,6 @@ public function __construct($cifChecker, $username, $password, $offline = false,
             case self::CHECKER_LISTA_FIRME:
                 $this->setupCheckers(array(self::CHECKER_LISTA_FIRME, self::CHECKER_VIES));
                 break;
-            case self::CHECKER_MFIN:
-                $this->setupCheckers(array(self::CHECKER_MFIN));
-                break;
             case self::CHECKER_OPEN_API:
                 $this->setupCheckers(array(self::CHECKER_OPEN_API, self::CHECKER_VIES, self::CHECKER_ANAF));
                 break;
@@ -87,9 +82,8 @@ public function __construct($cifChecker, $username, $password, $offline = false,
      * [
       'username' => string,
       'password' => string,
-      'offlien' => bool,
+      'offline' => bool,
       'enabled' => bool,
-      'pathToPhantom' => string,
       'logger' => \Psr\Log\LoggerInterface,
       'apiKey' => string,
       ]
@@ -123,17 +117,14 @@ private static function createCheckerInstance($checker, array $options)
             case self::CHECKER_LISTA_FIRME:
                 return new ListaFirme($options['username'], $options['password'], $options['offline'], $options['enabled']);
                 break;
-            case self::CHECKER_MFIN:
-                return new MFin($options['offline'], $options['enabled'], $options['pathToPhantom']);
-                break;
             case self::CHECKER_OPEN_API:
-                return new OpenAPI($options['offline'], $options['enabled'], $options['apiKey']);
+                return new OpenAPI($options['apiKey'], $options['offline'], $options['enabled']);
                 break;
             case self::CHECKER_ANAF:
                 return new Anaf($options['offline'], $options['enabled']);
                 break;
             case self::CHECKER_VIES:
-                return new Vies($options['offline'], $options['enabled'], $options['logger']);
+                return new Vies($options['logger'], $options['offline'], $options['enabled']);
                 break;
             default:
                 throw new \InvalidArgumentException('You provided an invalid cifChecker ' . $checker);

diff --git a/Lib/MFin.php b/Lib/MFin.php
diff --git a/Lib/OpenAPI.php b/Lib/OpenAPI.php
@@ -29,7 +29,7 @@ class OpenAPI extends AbstractCIFChecker implements CIFCheckerInterface
      *
      * @param bool $offline Set it to true if list firme is down or if you want to disable the check. It will make the check to return a mocked(dummy) response.
      */
-    public function __construct($offline = false, $enabled = true, $apiKey)
+    public function __construct($apiKey, $offline = false, $enabled = true)
     {
         parent::__construct($offline, $enabled);
 

diff --git a/Lib/Vies.php b/Lib/Vies.php
@@ -31,7 +31,7 @@ class Vies extends AbstractCIFChecker implements CIFCheckerInterface
      * WSDL Doc http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl
      * To unblock your IP send an email to TAXUD-VIESWEB@ec.europa.eu
      */
-    public function __construct($offline = false, $enabled = true, \Psr\Log\LoggerInterface $logger)
+    public function __construct( \Psr\Log\LoggerInterface $logger, $offline = false, $enabled = true)
     {
         parent::__construct($offline, $enabled);
 

diff --git a/Model/CompanyInterface.php b/Model/CompanyInterface.php
@@ -16,25 +16,27 @@ interface CompanyInterface
 
     public function getLongName();
 
-    public function setLongName($longName);
+    public function setLongName(string $longName);
 
     public function getCif();
 
-    public function setCif($cif);
+    public function setCif(string $cif);
 
     public function getAddress();
 
-    public function setAddress($address);
+    public function setAddress(?string $address);
 
     public function getCity();
 
-    public function setCity($city);
+    public function setCity(?string $city);
 
     public function getCountry();
 
-    public function setCountry($country);
+    public function setCountry(string $country);
 
-    public function setRegistrationNumber($registrationNumber);
+    public function setRegistrationNumber(?string $registrationNumber);
 
     public function getRegistrationNumber();
+
+    public function setIsVatPayer(bool $isVatPayer);
 }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,18 +1,17 @@
 services:
-    stev.lista_firme:
+    Stev\ListaFirmeBundle\Lib\CIFChecker:
         class: Stev\ListaFirmeBundle\Lib\CIFChecker
         arguments:
-            - %stev_lista_firme.cifChecker%
-            - %stev_lista_firme.username%
-            - %stev_lista_firme.password%
-            - %stev_lista_firme.offline%
-            - %stev_lista_firme.enabled%
-            - %stev_lista_firme.pathToPhantom%
+            - '%stev_lista_firme.cifChecker%'
+            - '%stev_lista_firme.username%'
+            - '%stev_lista_firme.password%'
             - '@logger'
-            - %stev_lista_firme.apiKey%
+            - '%stev_lista_firme.offline%'
+            - '%stev_lista_firme.enabled%'
+            - '%stev_lista_firme.apiKey%'
 
-    stev.lista_firme.validator.is_valid_company:
+    Stev\ListaFirmeBundle\Validator\Constraints\IsValidCompanyValidator:
         class: Stev\ListaFirmeBundle\Validator\Constraints\IsValidCompanyValidator
-        arguments: ['@stev.lista_firme','@logger']
+        arguments: ['@Stev\ListaFirmeBundle\Lib\CIFChecker','@logger']
         tags:
             - { name: validator.constraint_validator, alias: is_valid_company }
diff --git a/Resources/public/browser.js b/Resources/public/browser.js
diff --git a/Validator/Constraints/IsValidCompany.php b/Validator/Constraints/IsValidCompany.php
@@ -17,18 +17,19 @@
 /**
  * @Annotation
  */
+#[\Attribute]
 class IsValidCompany extends Constraint
 {
 
     public $message = 'CIF-ul %string% nu este valid.';
     public $details = '%string%';
 
-    public function getTargets()
+    public function getTargets(): array|string
     {
         return self::CLASS_CONSTRAINT;
     }
 
-    public function validatedBy()
+    public function validatedBy(): string
     {
         return 'is_valid_company';
     }