Merge pull request #26 from chives/dev

Upgrade dependencies, require symfony ^3.4, fixtures bundle ^3.1, allow symfony ^4.0
fsi-open · Mar 19, 2019 · 7f087f7 · 7f087f7
2 parents c4de20d + 9c47b97
commit 7f087f7
Show file tree

Hide file tree

Showing 51 changed files with 287 additions and 72 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,9 @@ sudo: false
 
 matrix:
     include:
-        - php: 7.0
+        - php: 7.1
           env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
-        - php: 7.0
+        - php: 7.3
 
 before_install:
     - composer self-update

diff --git a/Behat/Context/CommandContext.php b/Behat/Context/CommandContext.php
@@ -1,11 +1,18 @@
 <?php
 
+/**
+ * (c) FSi sp. z o.o. <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Behat\Context;
 
 use Behat\Symfony2Extension\Context\KernelAwareContext;
 use FSi\Bundle\TerytDatabaseBundle\Behat\Context\Console\ApplicationTester;
-use Guzzle\Http\Message\Response;
-use Guzzle\Plugin\Mock\MockPlugin;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\HttpKernel\KernelInterface;
 

diff --git a/Behat/Context/Console/ApplicationTester.php b/Behat/Context/Console/ApplicationTester.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * (c) FSi sp. z o.o. <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Behat\Context\Console;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;

diff --git a/Behat/Context/DataContext.php b/Behat/Context/DataContext.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * (c) FSi sp. z o.o. <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Behat\Context;
 
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -294,4 +303,4 @@ protected function findPlaceByName($name)
             ->getRepository('FSiTerytDbBundle:Place')
             ->findOneByName($name);
     }
-}
+}
diff --git a/Behat/Context/DownloadTerytCommandContext.php b/Behat/Context/DownloadTerytCommandContext.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * (c) FSi sp. z o.o. <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Behat\Context;
 
 use Behat\Symfony2Extension\Context\KernelAwareContext;

diff --git a/Behat/Context/ImportTerytCommandContext.php b/Behat/Context/ImportTerytCommandContext.php
@@ -1,11 +1,19 @@
 <?php
 
+/**
+ * (c) FSi sp. z o.o. <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Behat\Context;
 
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;
 use Behat\Symfony2Extension\Context\KernelAwareContext;
-use Behat\Symfony2Extension\Context\KernelAwareInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 class ImportTerytCommandContext implements KernelAwareContext
@@ -291,4 +299,4 @@ private function getStreetRepository()
             ->getManager()
             ->getRepository('FSiTerytDbBundle:Street');
     }
-}
+}
diff --git a/Behat/Fixtures/Project/app/AppKernel.php b/Behat/Fixtures/Project/app/AppKernel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * (c) FSi sp. z o.o. <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 

diff --git a/Command/TerytDownloadCommand.php b/Command/TerytDownloadCommand.php
@@ -7,32 +7,52 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use FSi\Bundle\TerytDatabaseBundle\Teryt\Api\Client;
 use SplTempFileObject;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Filesystem\Filesystem;
 
-abstract class TerytDownloadCommand extends ContainerAwareCommand
+abstract class TerytDownloadCommand extends Command
 {
-    protected function getDefaultTargetPath()
+    /**
+     * @var Client
+     */
+    private $client;
+
+    /**
+     * @var string
+     */
+    private $rootDir;
+
+    public function __construct(Client $client, string $rootDir)
+    {
+        parent::__construct();
+
+        $this->client = $client;
+        $this->rootDir = $rootDir;
+    }
+
+    protected function getDefaultTargetPath(): string
     {
-        return $this->getContainer()->getParameter('kernel.root_dir') . '/teryt';
+        return $this->rootDir . '/teryt';
     }
 
-    protected function getApiClient() : Client
+    protected function getApiClient(): Client
     {
-        return $this->getContainer()->get('fsi_teryt_db.api_client');
+        return $this->client;
     }
 
-    protected function saveFile(SplTempFileObject $file, string $path, string $fileName)
+    protected function saveFile(SplTempFileObject $file, string $path, string $fileName): void
     {
         $filesystem = new Filesystem();
         $filesystem->dumpFile(sprintf('%s/%s', $path, $fileName), $file->fread($this->getFileSize($file)));
     }
 
-    private function getFileSize(SplTempFileObject $file) : int
+    private function getFileSize(SplTempFileObject $file): int
     {
         $file->fseek(0, SEEK_END);
         $size = $file->ftell();

diff --git a/Command/TerytDownloadPlacesDatabaseCommand.php b/Command/TerytDownloadPlacesDatabaseCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Symfony\Component\Console\Input\InputArgument;
@@ -15,7 +17,7 @@
 
 class TerytDownloadPlacesDatabaseCommand extends TerytDownloadCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('teryt:download:places')
             ->setDescription('Download teryt places (SIMC) database files')
@@ -32,7 +34,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $this->saveFile(
             $this->getApiClient()->getPlacesData(),

diff --git a/Command/TerytDownloadPlacesDictionaryDatabaseCommand.php b/Command/TerytDownloadPlacesDictionaryDatabaseCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Symfony\Component\Console\Input\InputArgument;
@@ -15,7 +17,7 @@
 
 class TerytDownloadPlacesDictionaryDatabaseCommand extends TerytDownloadCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('teryt:download:places-dictionary')
             ->setDescription('Download teryt places dictionary (WMRODZ) database files')
@@ -32,7 +34,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $this->saveFile(
             $this->getApiClient()->getPlacesDictionaryData(),

diff --git a/Command/TerytDownloadStreetsDatabaseCommand.php b/Command/TerytDownloadStreetsDatabaseCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Symfony\Component\Console\Input\InputArgument;
@@ -15,7 +17,7 @@
 
 class TerytDownloadStreetsDatabaseCommand extends TerytDownloadCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('teryt:download:streets')
             ->setDescription('Download teryt streets database files')
@@ -32,7 +34,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $this->saveFile(
             $this->getApiClient()->getStreetsData(),

diff --git a/Command/TerytDownloadTerritorialDivisionDatabaseCommand.php b/Command/TerytDownloadTerritorialDivisionDatabaseCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Symfony\Component\Console\Input\InputArgument;
@@ -15,7 +17,7 @@
 
 class TerytDownloadTerritorialDivisionDatabaseCommand extends TerytDownloadCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('teryt:download:territorial-division')
             ->setDescription('Download teryt territorial division (TERC) database files')
@@ -32,7 +34,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $this->saveFile(
             $this->getApiClient()->getTerritorialDivisionData(),

diff --git a/Command/TerytImportCommand.php b/Command/TerytImportCommand.php
@@ -7,20 +7,28 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
 use Hobnob\XmlStreamReader\Parser;
 use SimpleXMLElement;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-abstract class TerytImportCommand extends ContainerAwareCommand
+abstract class TerytImportCommand extends Command
 {
     const FLUSH_FREQUENCY = 2000;
 
+    /**
+     * @var ManagerRegistry
+     */
+    private $managerRegistry;
+
     /** @var resource */
     protected $handle;
 
@@ -29,11 +37,18 @@ abstract class TerytImportCommand extends ContainerAwareCommand
      */
     private $progressBar;
 
+    public function __construct(ManagerRegistry $managerRegistry)
+    {
+        parent::__construct();
+
+        $this->managerRegistry = $managerRegistry;
+    }
+
     private $recordsCount = 0;
 
     /**
      * @param SimpleXMLElement $node
-     * @param \Doctrine\Common\Persistence\ObjectManager $om
+     * @param ObjectManager $om
      * @return \FSi\Bundle\TerytDatabaseBundle\Teryt\Import\NodeConverter
      */
     abstract public function getNodeConverter(SimpleXMLElement $node, ObjectManager $om);
@@ -135,11 +150,8 @@ private function importXmlFile(Parser $xmlParser, $xmlFile)
         fclose($this->handle);
     }
 
-    /**
-     * @return ObjectManager
-     */
-    private function getObjectManager()
+    private function getObjectManager(): ObjectManager
     {
-        return $this->getContainer()->get('doctrine')->getManager();
+        return $this->managerRegistry->getManager();
     }
 }
diff --git a/Command/TerytImportPlacesCommand.php b/Command/TerytImportPlacesCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Doctrine\Common\Persistence\ObjectManager;

diff --git a/Command/TerytImportPlacesDictionaryCommand.php b/Command/TerytImportPlacesDictionaryCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Doctrine\Common\Persistence\ObjectManager;

diff --git a/Command/TerytImportStreetsCommand.php b/Command/TerytImportStreetsCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Doctrine\Common\Persistence\ObjectManager;

diff --git a/Command/TerytImportTerritorialDivisionCommand.php b/Command/TerytImportTerritorialDivisionCommand.php
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace FSi\Bundle\TerytDatabaseBundle\Command;
 
 use Doctrine\Common\Persistence\ObjectManager;