Merge pull request #2450 from lucasmichot/feat/imports

Avoid FQCN and prefer imports
briannesbitt · Sep 13, 2021 · 005646e · 005646e
2 parents 6903cba + 58ed1c3
commit 005646e
Show file tree

Hide file tree

Showing 29 changed files with 147 additions and 65 deletions.
diff --git a/bin/carbon b/bin/carbon
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+use Carbon\Cli\Invoker;
+
 $dir = __DIR__.'/..';
 
 if (!file_exists($dir.'/autoload.php')) {
@@ -18,4 +20,4 @@ if (!file_exists($dir.'/autoload.php')) {
 
 require $dir.'/autoload.php';
 
-exit((new \Carbon\Cli\Invoker())(...$argv) ? 0 : 1);
+exit((new Invoker())(...$argv) ? 0 : 1);
diff --git a/phpdoc.php b/phpdoc.php
@@ -1,5 +1,9 @@
 <?php
 
+use Carbon\Carbon;
+use Carbon\CarbonImmutable;
+use Carbon\CarbonInterface;
+
 $tags = [
     'property',
     'property-read',
@@ -72,7 +76,7 @@ function dumpValue($value)
         return 'null';
     }
 
-    if ($value === \Carbon\CarbonInterface::TRANSLATE_ALL) {
+    if ($value === CarbonInterface::TRANSLATE_ALL) {
         return 'CarbonInterface::TRANSLATE_ALL';
     }
 
@@ -199,7 +203,7 @@ function dumpParameter($method, ReflectionParameter $parameter)
                     $unitName = unitName($unit);
                     $method = 'isSame'.ucFirst($unit);
 
-                    if (!method_exists(\Carbon\Carbon::class, $method)) {
+                    if (!method_exists(Carbon::class, $method)) {
                         $autoDocLines[] = [
                             '@method',
                             'bool',
@@ -524,17 +528,17 @@ function compileDoc($autoDocLines, $file)
 $staticMethods = [];
 $staticImmutableMethods = [];
 $methods = '';
-$carbonMethods = get_class_methods(\Carbon\Carbon::class);
+$carbonMethods = get_class_methods(Carbon::class);
 sort($carbonMethods);
 foreach ($carbonMethods as $method) {
-    if (!method_exists(\Carbon\CarbonImmutable::class, $method) ||
+    if (!method_exists(CarbonImmutable::class, $method) ||
         method_exists(DateTimeInterface::class, $method) ||
         $method === 'createFromInterface'
     ) {
         continue;
     }
 
-    $function = new ReflectionMethod(\Carbon\Carbon::class, $method);
+    $function = new ReflectionMethod(Carbon::class, $method);
     $static = $function->isStatic() ? ' static' : '';
     $parameters = implode(', ', array_map(function (ReflectionParameter $parameter) use ($method) {
         return dumpParameter($method, $parameter);

diff --git a/src/Carbon/CarbonInterface.php b/src/Carbon/CarbonInterface.php
@@ -27,6 +27,7 @@
 use JsonSerializable;
 use ReflectionException;
 use ReturnTypeWillChange;
+use Symfony\Component\Translation\TranslatorInterface;
 use Throwable;
 
 /**
@@ -3792,7 +3793,7 @@ public function setISODate($year, $week, $day = 1);
      *
      * @return $this
      */
-    public function setLocalTranslator(\Symfony\Component\Translation\TranslatorInterface $translator);
+    public function setLocalTranslator(TranslatorInterface $translator);
 
     /**
      * Set the current translator locale and indicate if the source locale file exists.
@@ -3917,7 +3918,7 @@ public static function setToStringFormat($format);
      *
      * @return void
      */
-    public static function setTranslator(\Symfony\Component\Translation\TranslatorInterface $translator);
+    public static function setTranslator(TranslatorInterface $translator);
 
     /**
      * Set specified unit to new given value.
@@ -4780,7 +4781,7 @@ public static function tomorrow($tz = null);
      *
      * @return string
      */
-    public function translate(string $key, array $parameters = [], $number = null, ?\Symfony\Component\Translation\TranslatorInterface $translator = null, bool $altNumbers = false): string;
+    public function translate(string $key, array $parameters = [], $number = null, ?TranslatorInterface $translator = null, bool $altNumbers = false): string;
 
     /**
      * Returns the alternative number for a given integer if available in the current locale.
@@ -4829,7 +4830,7 @@ public function translateTimeStringTo($timeString, $to = null);
      *
      * @return string
      */
-    public static function translateWith(\Symfony\Component\Translation\TranslatorInterface $translator, string $key, array $parameters = [], $number = null): string;
+    public static function translateWith(TranslatorInterface $translator, string $key, array $parameters = [], $number = null): string;
 
     /**
      * Format as ->format() do (using date replacements patterns from https://php.net/manual/en/function.date.php)

diff --git a/src/Carbon/CarbonTimeZone.php b/src/Carbon/CarbonTimeZone.php
@@ -14,6 +14,7 @@
 use Carbon\Exceptions\InvalidTimeZoneException;
 use DateTimeInterface;
 use DateTimeZone;
+use Throwable;
 
 class CarbonTimeZone extends DateTimeZone
 {
@@ -198,7 +199,7 @@ public function toRegionName(DateTimeInterface $date = null, $isDst = 1)
         // @codeCoverageIgnoreStart
         try {
             $offset = @$this->getOffset($date) ?: 0;
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             $offset = 0;
         }
         // @codeCoverageIgnoreEnd

diff --git a/src/Carbon/Lang/be.php b/src/Carbon/Lang/be.php
@@ -9,8 +9,12 @@
  * file that was distributed with this source code.
  */
 // @codeCoverageIgnoreStart
+
+use Carbon\CarbonInterface;
+use Symfony\Component\Translation\PluralizationRules;
+
 if (class_exists('Symfony\\Component\\Translation\\PluralizationRules')) {
-    \Symfony\Component\Translation\PluralizationRules::set(function ($number) {
+    PluralizationRules::set(function ($number) {
         return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
     }, 'be');
 }
@@ -113,7 +117,7 @@
         'nextDay' => '[Заўтра ў] LT',
         'nextWeek' => '[У] dddd [ў] LT',
         'lastDay' => '[Учора ў] LT',
-        'lastWeek' => function (\Carbon\CarbonInterface $current) {
+        'lastWeek' => function (CarbonInterface $current) {
             switch ($current->dayOfWeek) {
                 case 1:
                 case 2:

diff --git a/src/Carbon/Lang/bg.php b/src/Carbon/Lang/bg.php
@@ -17,6 +17,9 @@
  * - JD Isaacks
  * - Glavić
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count година|:count години',
     'a_year' => 'година|:count години',
@@ -63,7 +66,7 @@
         'nextDay' => '[Утре в] LT',
         'nextWeek' => 'dddd [в] LT',
         'lastDay' => '[Вчера в] LT',
-        'lastWeek' => function (\Carbon\CarbonInterface $current) {
+        'lastWeek' => function (CarbonInterface $current) {
             switch ($current->dayOfWeek) {
                 case 0:
                 case 3:

diff --git a/src/Carbon/Lang/bs.php b/src/Carbon/Lang/bs.php
@@ -18,6 +18,9 @@
  * - Serhan Apaydın
  * - JD Isaacks
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count godina|:count godine|:count godina',
     'y' => ':count godina|:count godine|:count godina',
@@ -55,7 +58,7 @@
     'calendar' => [
         'sameDay' => '[danas u] LT',
         'nextDay' => '[sutra u] LT',
-        'nextWeek' => function (\Carbon\CarbonInterface $current) {
+        'nextWeek' => function (CarbonInterface $current) {
             switch ($current->dayOfWeek) {
                 case 0:
                     return '[u] [nedjelju] [u] LT';
@@ -68,7 +71,7 @@
             }
         },
         'lastDay' => '[jučer u] LT',
-        'lastWeek' => function (\Carbon\CarbonInterface $current) {
+        'lastWeek' => function (CarbonInterface $current) {
             switch ($current->dayOfWeek) {
                 case 0:
                 case 3:

diff --git a/src/Carbon/Lang/ca.php b/src/Carbon/Lang/ca.php
@@ -21,6 +21,9 @@
  * - Xavi
  * - qcardona
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count any|:count anys',
     'a_year' => 'un any|:count anys',
@@ -69,19 +72,19 @@
         'LLLL' => 'dddd D MMMM [de] YYYY [a les] H:mm',
     ],
     'calendar' => [
-        'sameDay' => function (\Carbon\CarbonInterface $current) {
+        'sameDay' => function (CarbonInterface $current) {
             return '[avui a '.($current->hour !== 1 ? 'les' : 'la').'] LT';
         },
-        'nextDay' => function (\Carbon\CarbonInterface $current) {
+        'nextDay' => function (CarbonInterface $current) {
             return '[demà a '.($current->hour !== 1 ? 'les' : 'la').'] LT';
         },
-        'nextWeek' => function (\Carbon\CarbonInterface $current) {
+        'nextWeek' => function (CarbonInterface $current) {
             return 'dddd [a '.($current->hour !== 1 ? 'les' : 'la').'] LT';
         },
-        'lastDay' => function (\Carbon\CarbonInterface $current) {
+        'lastDay' => function (CarbonInterface $current) {
             return '[ahir a '.($current->hour !== 1 ? 'les' : 'la').'] LT';
         },
-        'lastWeek' => function (\Carbon\CarbonInterface $current) {
+        'lastWeek' => function (CarbonInterface $current) {
             return '[el] dddd [passat a '.($current->hour !== 1 ? 'les' : 'la').'] LT';
         },
         'sameElse' => 'L',

diff --git a/src/Carbon/Lang/el.php b/src/Carbon/Lang/el.php
@@ -19,6 +19,9 @@
  * - yiannisdesp
  * - Ilias Kasmeridis (iliaskasm)
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count χρόνος|:count χρόνια',
     'a_year' => 'ένας χρόνος|:count χρόνια',
@@ -65,7 +68,7 @@
         'nextDay' => '[Αύριο {}] LT',
         'nextWeek' => 'dddd [{}] LT',
         'lastDay' => '[Χθες {}] LT',
-        'lastWeek' => function (\Carbon\CarbonInterface $current) {
+        'lastWeek' => function (CarbonInterface $current) {
             switch ($current->dayOfWeek) {
                 case 6:
                     return '[το προηγούμενο] dddd [{}] LT';

diff --git a/src/Carbon/Lang/es.php b/src/Carbon/Lang/es.php
@@ -27,6 +27,9 @@
  * - Daniel Commesse Liévanos (danielcommesse)
  * - Pete Scopes (pdscopes)
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count año|:count años',
     'a_year' => 'un año|:count años',
@@ -77,19 +80,19 @@
         'LLLL' => 'dddd, D [de] MMMM [de] YYYY H:mm',
     ],
     'calendar' => [
-        'sameDay' => function (\Carbon\CarbonInterface $current) {
+        'sameDay' => function (CarbonInterface $current) {
             return '[hoy a la'.($current->hour !== 1 ? 's' : '').'] LT';
         },
-        'nextDay' => function (\Carbon\CarbonInterface $current) {
+        'nextDay' => function (CarbonInterface $current) {
             return '[mañana a la'.($current->hour !== 1 ? 's' : '').'] LT';
         },
-        'nextWeek' => function (\Carbon\CarbonInterface $current) {
+        'nextWeek' => function (CarbonInterface $current) {
             return 'dddd [a la'.($current->hour !== 1 ? 's' : '').'] LT';
         },
-        'lastDay' => function (\Carbon\CarbonInterface $current) {
+        'lastDay' => function (CarbonInterface $current) {
             return '[ayer a la'.($current->hour !== 1 ? 's' : '').'] LT';
         },
-        'lastWeek' => function (\Carbon\CarbonInterface $current) {
+        'lastWeek' => function (CarbonInterface $current) {
             return '[el] dddd [pasado a la'.($current->hour !== 1 ? 's' : '').'] LT';
         },
         'sameElse' => 'L',

diff --git a/src/Carbon/Lang/gl.php b/src/Carbon/Lang/gl.php
@@ -17,6 +17,9 @@
  * - Diego Vilariño
  * - Sebastian Thierer
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count ano|:count anos',
     'a_year' => 'un ano|:count anos',
@@ -65,19 +68,19 @@
         'LLLL' => 'dddd, D [de] MMMM [de] YYYY H:mm',
     ],
     'calendar' => [
-        'sameDay' => function (\Carbon\CarbonInterface $current) {
+        'sameDay' => function (CarbonInterface $current) {
             return '[hoxe '.($current->hour !== 1 ? 'ás' : 'á').'] LT';
         },
-        'nextDay' => function (\Carbon\CarbonInterface $current) {
+        'nextDay' => function (CarbonInterface $current) {
             return '[mañá '.($current->hour !== 1 ? 'ás' : 'á').'] LT';
         },
-        'nextWeek' => function (\Carbon\CarbonInterface $current) {
+        'nextWeek' => function (CarbonInterface $current) {
             return 'dddd ['.($current->hour !== 1 ? 'ás' : 'á').'] LT';
         },
-        'lastDay' => function (\Carbon\CarbonInterface $current) {
+        'lastDay' => function (CarbonInterface $current) {
             return '[onte '.($current->hour !== 1 ? 'á' : 'a').'] LT';
         },
-        'lastWeek' => function (\Carbon\CarbonInterface $current) {
+        'lastWeek' => function (CarbonInterface $current) {
             return '[o] dddd [pasado '.($current->hour !== 1 ? 'ás' : 'á').'] LT';
         },
         'sameElse' => 'L',

diff --git a/src/Carbon/Lang/hr.php b/src/Carbon/Lang/hr.php
@@ -27,6 +27,9 @@
  * - Stjepan Majdak
  * - Vanja Retkovac (vr00)
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count godinu|:count godine|:count godina',
     'y' => ':count god.|:count god.|:count god.',
@@ -67,7 +70,7 @@
     'calendar' => [
         'sameDay' => '[danas u] LT',
         'nextDay' => '[sutra u] LT',
-        'nextWeek' => function (\Carbon\CarbonInterface $date) {
+        'nextWeek' => function (CarbonInterface $date) {
             switch ($date->dayOfWeek) {
                 case 0:
                     return '[u] [nedjelju] [u] LT';
@@ -80,7 +83,7 @@
             }
         },
         'lastDay' => '[jučer u] LT',
-        'lastWeek' => function (\Carbon\CarbonInterface $date) {
+        'lastWeek' => function (CarbonInterface $date) {
             switch ($date->dayOfWeek) {
                 case 0:
                 case 3:

diff --git a/src/Carbon/Lang/hu.php b/src/Carbon/Lang/hu.php
@@ -15,6 +15,9 @@
  * - Brett Johnson
  * - balping
  */
+
+use Carbon\CarbonInterface;
+
 $huWeekEndings = ['vasárnap', 'hétfőn', 'kedden', 'szerdán', 'csütörtökön', 'pénteken', 'szombaton'];
 
 return [
@@ -99,11 +102,11 @@
     'calendar' => [
         'sameDay' => '[ma] LT[-kor]',
         'nextDay' => '[holnap] LT[-kor]',
-        'nextWeek' => function (\Carbon\CarbonInterface $date) use ($huWeekEndings) {
+        'nextWeek' => function (CarbonInterface $date) use ($huWeekEndings) {
             return '['.$huWeekEndings[$date->dayOfWeek].'] LT[-kor]';
         },
         'lastDay' => '[tegnap] LT[-kor]',
-        'lastWeek' => function (\Carbon\CarbonInterface $date) use ($huWeekEndings) {
+        'lastWeek' => function (CarbonInterface $date) use ($huWeekEndings) {
             return '[múlt '.$huWeekEndings[$date->dayOfWeek].'] LT[-kor]';
         },
         'sameElse' => 'L',

diff --git a/src/Carbon/Lang/it.php b/src/Carbon/Lang/it.php
@@ -22,6 +22,9 @@
  * - Davide Casiraghi (davide-casiraghi)
  * - Pete Scopes (pdscopes)
  */
+
+use Carbon\CarbonInterface;
+
 return [
     'year' => ':count anno|:count anni',
     'a_year' => 'un anno|:count anni',
@@ -81,7 +84,7 @@
         'nextDay' => '[Domani alle] LT',
         'nextWeek' => 'dddd [alle] LT',
         'lastDay' => '[Ieri alle] LT',
-        'lastWeek' => function (\Carbon\CarbonInterface $date) {
+        'lastWeek' => function (CarbonInterface $date) {
             switch ($date->dayOfWeek) {
                 case 0:
                     return '[la scorsa] dddd [alle] LT';