diff --git a/src/Component/CsvParser.php b/src/Component/CsvParser.php index 885f1b57..44919118 100644 --- a/src/Component/CsvParser.php +++ b/src/Component/CsvParser.php @@ -226,7 +226,7 @@ class CsvParser implements \Iterator { return; } - // Skip empty lines that aren't wrapped in an enclosure. + // Skip empty lines that aren't wrapped in an enclosure. } while (!strlen(rtrim($line, "\r\n"))); $this->currentLine = $this->parseLine($line); @@ -291,7 +291,7 @@ class CsvParser implements \Iterator { // Traverse the line byte-by-byte. for ($index = 0; $index < $line_length; ++$index) { $byte = $line[$index]; - $next_byte = isset($line[$index + 1]) ? $line[$index + 1] : ''; + $next_byte = $line[$index + 1] ?? ''; // Beginning a quoted field. if ($byte === '"' && $field === '' && !$in_quotes) { diff --git a/src/EventSubscriber/LazySubscriber.php b/src/EventSubscriber/LazySubscriber.php index 8c81cb94..d3bf4260 100644 --- a/src/EventSubscriber/LazySubscriber.php +++ b/src/EventSubscriber/LazySubscriber.php @@ -14,7 +14,6 @@ use Drupal\feeds\FeedTypeInterface; use Drupal\feeds\Plugin\Type\CleanableInterface; use Drupal\feeds\Plugin\Type\ClearableInterface; use Drupal\feeds\StateInterface; -use Exception; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -122,7 +121,7 @@ class LazySubscriber implements EventSubscriberInterface { $feed = $event->getFeed(); $plugin->clean($feed, $event->getEntity(), $feed->getState(StateInterface::CLEAN)); } - catch (Exception $e) { + catch (\Exception $e) { watchdog_exception('feeds', $e); } }); diff --git a/src/Exception/FeedsRuntimeException.php b/src/Exception/FeedsRuntimeException.php index b550c19d..c3bd5649 100644 --- a/src/Exception/FeedsRuntimeException.php +++ b/src/Exception/FeedsRuntimeException.php @@ -2,9 +2,7 @@ namespace Drupal\feeds\Exception; -use RuntimeException; - /** * Base class for Feeds runtime exceptions. */ -abstract class FeedsRuntimeException extends RuntimeException {} +abstract class FeedsRuntimeException extends \RuntimeException {} diff --git a/src/Feeds/Item/BaseItem.php b/src/Feeds/Item/BaseItem.php index 919a6102..06b0dffc 100644 --- a/src/Feeds/Item/BaseItem.php +++ b/src/Feeds/Item/BaseItem.php @@ -11,7 +11,7 @@ abstract class BaseItem implements ItemInterface { * {@inheritdoc} */ public function get($field) { - return isset($this->$field) ? $this->$field : NULL; + return $this->$field ?? NULL; } /** diff --git a/src/Feeds/Item/DynamicItem.php b/src/Feeds/Item/DynamicItem.php index 2e7ea62a..d65ddbb3 100644 --- a/src/Feeds/Item/DynamicItem.php +++ b/src/Feeds/Item/DynamicItem.php @@ -20,7 +20,7 @@ class DynamicItem implements ItemInterface { * {@inheritdoc} */ public function get($field) { - return isset($this->data[$field]) ? $this->data[$field] : NULL; + return $this->data[$field] ?? NULL; } /** diff --git a/src/Feeds/Parser/CsvParser.php b/src/Feeds/Parser/CsvParser.php index 0fd22857..e6413114 100644 --- a/src/Feeds/Parser/CsvParser.php +++ b/src/Feeds/Parser/CsvParser.php @@ -64,7 +64,7 @@ class CsvParser extends ParserBase { $item = new DynamicItem(); foreach ($row as $delta => $cell) { - $key = isset($header[$delta]) ? $header[$delta] : $delta; + $key = $header[$delta] ?? $delta; if (isset($skip_sources[$key])) { // Skip custom sources that are not of type "csv". continue; diff --git a/src/Feeds/Source/BasicFieldSource.php b/src/Feeds/Source/BasicFieldSource.php index 6896d929..986b59b3 100644 --- a/src/Feeds/Source/BasicFieldSource.php +++ b/src/Feeds/Source/BasicFieldSource.php @@ -43,7 +43,7 @@ class BasicFieldSource extends SourceBase { * source/feed id combo. */ public function getSourceElement(FeedInterface $feed, ItemInterface $item) { - list(, $field_name) = explode(':', $this->configuration['source']); + [, $field_name] = explode(':', $this->configuration['source']); $return = []; if ($field_list = $feed->get($field_name)) { diff --git a/src/Feeds/State/CleanStateInterface.php b/src/Feeds/State/CleanStateInterface.php index b3378328..3f3f1a75 100644 --- a/src/Feeds/State/CleanStateInterface.php +++ b/src/Feeds/State/CleanStateInterface.php @@ -2,15 +2,13 @@ namespace Drupal\feeds\Feeds\State; -use Countable; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\feeds\StateInterface; -use IteratorAggregate; /** * Status of the clean phase of an import. */ -interface CleanStateInterface extends StateInterface, IteratorAggregate, Countable { +interface CleanStateInterface extends StateInterface, \IteratorAggregate, \Countable { /** * Returns if the list is initiated. diff --git a/src/Feeds/Target/Book.php b/src/Feeds/Target/Book.php index f3f73b4f..ae174a07 100644 --- a/src/Feeds/Target/Book.php +++ b/src/Feeds/Target/Book.php @@ -450,7 +450,7 @@ class Book extends TargetBase implements ConfigurableTargetInterface, ContainerF $delta = 0; foreach ($form_state->getValues() as $key => $value) { if (strpos($key, 'target-settings-') === 0) { - list(, , $delta) = explode('-', $key); + [, , $delta] = explode('-', $key); break; } } diff --git a/src/Feeds/Target/Language.php b/src/Feeds/Target/Language.php index 38250970..c12fd237 100644 --- a/src/Feeds/Target/Language.php +++ b/src/Feeds/Target/Language.php @@ -23,7 +23,7 @@ class Language extends FieldTargetBase { */ public function setTarget(FeedInterface $feed, EntityInterface $entity, $field_name, array $values) { if ($values = $this->prepareValues($values)) { - $langcode = isset($values[0]['value']) ? $values[0]['value'] : NULL; + $langcode = $values[0]['value'] ?? NULL; if (!empty($langcode)) { $entity->set($field_name, $langcode); } diff --git a/src/Form/FeedTypeDeleteForm.php b/src/Form/FeedTypeDeleteForm.php index f95e3208..5bc8a6f6 100644 --- a/src/Form/FeedTypeDeleteForm.php +++ b/src/Form/FeedTypeDeleteForm.php @@ -4,7 +4,6 @@ namespace Drupal\feeds\Form; use Drupal\Core\Entity\EntityDeleteForm; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Url; /** * Provides a form for feed type deletion. diff --git a/src/Laminas/Extension/Georss/Entry.php b/src/Laminas/Extension/Georss/Entry.php index 400123a3..897bf878 100644 --- a/src/Laminas/Extension/Georss/Entry.php +++ b/src/Laminas/Extension/Georss/Entry.php @@ -20,7 +20,7 @@ class Entry extends AbstractEntry { */ public function getGeoPoint($index = 0) { $points = $this->getGeoPoints(); - return isset($points[$index]) ? $points[$index] : NULL; + return $points[$index] ?? NULL; } /** diff --git a/tests/modules/feeds_test_extra_sources/src/Feeds/Source/SiteSource.php b/tests/modules/feeds_test_extra_sources/src/Feeds/Source/SiteSource.php index bfe63ad4..4b9af683 100644 --- a/tests/modules/feeds_test_extra_sources/src/Feeds/Source/SiteSource.php +++ b/tests/modules/feeds_test_extra_sources/src/Feeds/Source/SiteSource.php @@ -38,7 +38,7 @@ class SiteSource extends SourceBase { * {@inheritdoc} */ public function getSourceElement(FeedInterface $feed, ItemInterface $item) { - list(, $field_name) = explode(':', $this->configuration['source']); + [, $field_name] = explode(':', $this->configuration['source']); return \Drupal::config('system.site')->get($field_name); } diff --git a/tests/src/Kernel/Feeds/Processor/GenericContentEntityProcessorTest.php b/tests/src/Kernel/Feeds/Processor/GenericContentEntityProcessorTest.php index 41867702..af7bd986 100644 --- a/tests/src/Kernel/Feeds/Processor/GenericContentEntityProcessorTest.php +++ b/tests/src/Kernel/Feeds/Processor/GenericContentEntityProcessorTest.php @@ -72,7 +72,7 @@ class GenericContentEntityProcessorTest extends FeedsKernelTestBase { $mappings[] = [ 'target' => $target, 'map' => ['value' => $source], - 'settings' => isset($settings[$source]) ? $settings[$source] : [], + 'settings' => $settings[$source] ?? [], ]; } diff --git a/tests/src/Kernel/Feeds/Target/FieldTest.php b/tests/src/Kernel/Feeds/Target/FieldTest.php index dec728a8..a20df043 100644 --- a/tests/src/Kernel/Feeds/Target/FieldTest.php +++ b/tests/src/Kernel/Feeds/Target/FieldTest.php @@ -314,7 +314,7 @@ class FieldTest extends FeedsKernelTestBase { 'title' => $this->randomMachineName(8), 'type' => 'article', 'uid' => 0, - $field => isset($expected_values[$field]) ? $expected_values[$field] : NULL, + $field => $expected_values[$field] ?? NULL, ]; $node = Node::create($values); $node->save(); diff --git a/tests/src/Traits/FeedsReflectionTrait.php b/tests/src/Traits/FeedsReflectionTrait.php index a44e8031..10be585d 100644 --- a/tests/src/Traits/FeedsReflectionTrait.php +++ b/tests/src/Traits/FeedsReflectionTrait.php @@ -2,9 +2,6 @@ namespace Drupal\Tests\feeds\Traits; -use ReflectionClass; -use ReflectionObject; - /** * Trait for using reflection in tests. */ @@ -22,7 +19,7 @@ trait FeedsReflectionTrait { * A ReflectionMethod. */ protected function getMethod($class, $name) { - $class = new ReflectionClass($class); + $class = new \ReflectionClass($class); $method = $class->getMethod($name); $method->setAccessible(TRUE); return $method; @@ -39,7 +36,7 @@ trait FeedsReflectionTrait { * The value that the property should get. */ protected function setProtectedProperty($object, $property_name, $value) { - $ref_object = new ReflectionObject($object); + $ref_object = new \ReflectionObject($object); $property = $ref_object->getProperty($property_name); $property->setAccessible(TRUE); $property->setValue($object, $value); diff --git a/tests/src/Unit/Component/CsvParserTest.php b/tests/src/Unit/Component/CsvParserTest.php index e598258a..05fd78d9 100644 --- a/tests/src/Unit/Component/CsvParserTest.php +++ b/tests/src/Unit/Component/CsvParserTest.php @@ -4,7 +4,6 @@ namespace Drupal\Tests\feeds\Unit\Component; use Drupal\feeds\Component\CsvParser; use Drupal\Tests\feeds\Unit\FeedsUnitTestCase; -use InvalidArgumentException; /** * @coversDefaultClass \Drupal\feeds\Component\CsvParser @@ -98,7 +97,7 @@ class CsvParserTest extends FeedsUnitTestCase { * Tries to create a CsvParser instance with an invalid file path. */ public function testInvalidFilePath() { - $this->expectException(InvalidArgumentException::class); + $this->expectException(\InvalidArgumentException::class); CsvParser::createFromFilePath('beep boop'); } @@ -106,7 +105,7 @@ class CsvParserTest extends FeedsUnitTestCase { * Creates a new CsvParser instance with an invalid CSV source. */ public function testInvalidResourcePath() { - $this->expectException(InvalidArgumentException::class); + $this->expectException(\InvalidArgumentException::class); new CsvParser('beep boop'); } diff --git a/tests/src/Unit/Plugin/QueueWorker/FeedQueueWorkerBaseTest.php b/tests/src/Unit/Plugin/QueueWorker/FeedQueueWorkerBaseTest.php index 60f42c3c..697ddb0a 100644 --- a/tests/src/Unit/Plugin/QueueWorker/FeedQueueWorkerBaseTest.php +++ b/tests/src/Unit/Plugin/QueueWorker/FeedQueueWorkerBaseTest.php @@ -6,7 +6,6 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\feeds\Exception\EmptyFeedException; use Drupal\Tests\feeds\Unit\FeedsUnitTestCase; -use RuntimeException; use Symfony\Component\EventDispatcher\EventDispatcher; /** @@ -31,8 +30,8 @@ class FeedQueueWorkerBaseTest extends FeedsUnitTestCase { $method = $this->getProtectedClosure($plugin, 'handleException'); $method($this->getMockFeed(), new EmptyFeedException()); - $this->expectException(RuntimeException::class); - $method($this->getMockFeed(), new RuntimeException()); + $this->expectException(\RuntimeException::class); + $method($this->getMockFeed(), new \RuntimeException()); } } diff --git a/tests/src/Unit/Result/FetcherResultTest.php b/tests/src/Unit/Result/FetcherResultTest.php index 80f2a03e..8507c06b 100644 --- a/tests/src/Unit/Result/FetcherResultTest.php +++ b/tests/src/Unit/Result/FetcherResultTest.php @@ -4,7 +4,6 @@ namespace Drupal\Tests\feeds\Unit\Result; use Drupal\feeds\Result\FetcherResult; use Drupal\Tests\feeds\Unit\FeedsUnitTestCase; -use RuntimeException; /** * @coversDefaultClass \Drupal\feeds\Result\FetcherResult @@ -44,7 +43,7 @@ class FetcherResultTest extends FeedsUnitTestCase { */ public function testNonExistantFile() { $result = new FetcherResult('IDONOTEXIST'); - $this->expectException(RuntimeException::class); + $this->expectException(\RuntimeException::class); $result->getRaw(); } @@ -55,7 +54,7 @@ class FetcherResultTest extends FeedsUnitTestCase { file_put_contents('vfs://feeds/test_file', 'I am test data.'); chmod('vfs://feeds/test_file', 000); $result = new FetcherResult('vfs://feeds/test_file'); - $this->expectException(RuntimeException::class); + $this->expectException(\RuntimeException::class); $result->getRaw(); } @@ -66,7 +65,7 @@ class FetcherResultTest extends FeedsUnitTestCase { file_put_contents('vfs://feeds/test_file', pack('CCC', 0xef, 0xbb, 0xbf) . 'I am test data.'); chmod('vfs://feeds/test_file', 0444); $result = new FetcherResult('vfs://feeds/test_file'); - $this->expectException(RuntimeException::class); + $this->expectException(\RuntimeException::class); $result->getFilePath(); }