Fix code style and tests

Author: curry684

CHANGELOG.md

@@ -3,9 +3,21 @@ All notable changes to `omines\datatables-bundle` will be documented in this fil
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+Nothing yet.
+
+## [0.5.0] - 2020-06-29
+### Added
+ - Support for server-side exportsv (#83)
+ - Support for per-column searches (#120)
+ - ORM adapter supporting fetch joins (#121)
+ - TwigStringColumn type for simple inline templating (#146)
+
 ### Changed
  - Fix contract dependency handling by upping Symfony requirement to 4.2+
 
+### Fixed
+ - Use trans() for proper locale fallback when using CDN languages (#141)
+
 ## [0.4.2] - 2020-04-08
 ### Added
  - Update translations automatically with script (#130)
@@ -116,7 +128,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
  - Basic functionality
 
-[Unreleased]: https://github.com/omines/datatables-bundle/compare/0.4.2...master
+[Unreleased]: https://github.com/omines/datatables-bundle/compare/0.5.0...master
+[0.5.0]: https://github.com/omines/datatables-bundle/compare/0.4.2...0.5.0
 [0.4.2]: https://github.com/omines/datatables-bundle/compare/0.4.1...0.4.2
 [0.4.1]: https://github.com/omines/datatables-bundle/compare/0.4.0...0.4.1
 [0.4.0]: https://github.com/omines/datatables-bundle/compare/0.3.1...0.4.0

src/Adapter/Doctrine/FetchJoinORMAdapter.php

@@ -1,7 +1,8 @@
 <?php
+
 /*
  * Symfony DataTables Bundle
- * (c) Jan Böhmer 2020
+ * (c) Omines Internetbureau B.V. - https://omines.nl/
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/DataTable.php

@@ -112,11 +112,6 @@ class DataTable
 
     /**
      * DataTable constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param DataTableExporterManager $exporterManager
-     * @param array $options
-     * @param Instantiator|null $instantiator
      */
     public function __construct(EventDispatcherInterface $eventDispatcher, DataTableExporterManager $exporterManager, array $options = [], Instantiator $instantiator = null)
     {

src/Exporter/Csv/CsvExporter.php

@@ -1,5 +1,13 @@
 <?php
 
+/*
+ * Symfony DataTables Bundle
+ * (c) Omines Internetbureau B.V. - https://omines.nl/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Omines\DataTablesBundle\Exporter\Csv;

src/Exporter/DataTableExporterCollection.php

@@ -27,8 +27,6 @@ class DataTableExporterCollection
 
     /**
      * DataTableExporterCollection constructor.
-     *
-     * @param \Traversable $exporters
      */
     public function __construct(\Traversable $exporters)
     {
@@ -38,10 +36,6 @@ public function __construct(\Traversable $exporters)
     /**
      * Finds a DataTable exporter that matches the given name.
      *
-     * @param string $name
-     *
-     * @return DataTableExporterInterface
-     *
      * @throws UnknownDataTableExporterException
      */
     public function getByName(string $name): DataTableExporterInterface

src/Exporter/DataTableExporterInterface.php

@@ -21,18 +21,11 @@ interface DataTableExporterInterface
 {
     /**
      * Exports the data from the DataTable to a file.
-     *
-     * @param array $columnNames
-     * @param \Iterator $data
-     *
-     * @return \SplFileInfo
      */
     public function export(array $columnNames, \Iterator $data): \SplFileInfo;
 
     /**
      * A unique name to identify the exporter.
-     *
-     * @return string
      */
     public function getName(): string;
 }

src/Exporter/DataTableExporterManager.php

@@ -13,7 +13,6 @@
 namespace Omines\DataTablesBundle\Exporter;
 
 use Omines\DataTablesBundle\DataTable;
-use Omines\DataTablesBundle\DataTableState;
 use Omines\DataTablesBundle\Exception\InvalidArgumentException;
 use Omines\DataTablesBundle\Exporter\Event\DataTableExporterResponseEvent;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -44,7 +43,6 @@ class DataTableExporterManager
     /**
      * DataTableExporterManager constructor.
      *
-     * @param DataTableExporterCollection $exporterCollection
      * @param TranslatorInterface|LegacyTranslatorInterface $translator
      */
     public function __construct(DataTableExporterCollection $exporterCollection, $translator)
@@ -58,8 +56,6 @@ public function __construct(DataTableExporterCollection $exporterCollection, $tr
     }
 
     /**
-     * @param string $exporterName
-     *
      * @return DataTableExporterManager
      */
     public function setExporterName(string $exporterName): self
@@ -70,8 +66,6 @@ public function setExporterName(string $exporterName): self
     }
 
     /**
-     * @param DataTable $dataTable
-     *
      * @return DataTableExporterManager
      */
     public function setDataTable(DataTable $dataTable): self
@@ -82,8 +76,6 @@ public function setDataTable(DataTable $dataTable): self
     }
 
     /**
-     * @return Response
-     *
      * @throws \Omines\DataTablesBundle\Exception\UnknownDataTableExporterException
      */
     public function getResponse(): Response
@@ -121,8 +113,6 @@ private function getColumnNames(): array
      *
      * A Generator is created in order to remove the 'DT_RowId' key
      * which is created by some adapters (e.g. ORMAdapter).
-     *
-     * @return \Iterator
      */
     private function getAllData(): \Iterator
     {

src/Exporter/Event/DataTableExporterResponseEvent.php

@@ -12,8 +12,8 @@
 
 namespace Omines\DataTablesBundle\Exporter\Event;
 
-use Symfony\Contracts\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * DataTableExporterResponseEvent.
@@ -27,17 +27,12 @@ class DataTableExporterResponseEvent extends Event
 
     /**
      * DataTableExporterResponseEvent constructor.
-     *
-     * @param BinaryFileResponse $response
      */
     public function __construct(BinaryFileResponse $response)
     {
         $this->response = $response;
     }
 
-    /**
-     * @return BinaryFileResponse
-     */
     public function getResponse(): BinaryFileResponse
     {
         return $this->response;

src/Exporter/Excel/ExcelExporter.php

@@ -62,8 +62,6 @@ public function export(array $columnNames, \Iterator $data): \SplFileInfo
     /**
      * Sets the columns width to automatically fit the contents.
      *
-     * @param Worksheet $sheet
-     *
      * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
     private function autoSizeColumnWidth(Worksheet $sheet)

src/Twig/DataTablesExtension.php

@@ -52,7 +52,7 @@ public function getFunctions()
      */
     private function getLanguageSettings(DataTable $dataTable)
     {
-        if ($dataTable->isLanguageFromCDN() && ($cdnFile = $this->getCDNLanguageFile()) !== null) {
+        if ($dataTable->isLanguageFromCDN() && null !== ($cdnFile = $this->getCDNLanguageFile())) {
             return ['url' => '//cdn.datatables.net/plug-ins/1.10.15/i18n/' . $cdnFile];
         }
 
@@ -98,7 +98,7 @@ private function getCDNLanguageFile()
         $file = $this->translator->trans('file', [], 'DataTablesCDN');
 
         // CDN language file does not exists
-        if ($file === 'file') {
+        if ('file' === $file) {
             return null;
         }