private => protected

tanigami · Jan 29, 2019 · 00542b2 · 00542b2
1 parent 6f67fe5
commit 00542b2
Show file tree

Hide file tree

Showing 21 changed files with 99 additions and 98 deletions.
diff --git a/src/Geo/Country.php b/src/Geo/Country.php
@@ -267,17 +267,17 @@ class Country
     /**
      * @var string
      */
-    private $isoCode;
+    protected $isoCode;
 
     /**
      * @var string
      */
-    private $name;
+    protected $name;
 
     /**
      * @param string $isoCode
      */
-    private function __construct(string $isoCode, string $name)
+    protected function __construct(string $isoCode, string $name)
     {
         $this->isoCode = $isoCode;
         $this->name = $name;
@@ -296,7 +296,7 @@ public static function __callStatic(string $name, array $arguments)
             throw new InvalidArgumentException(sprintf('Invalid country code: %s', $isoCode));
         }
 
-        return new self($isoCode, $name);
+        return new static($isoCode, $name);
     }
 
     /**

diff --git a/src/Geo/Japan/Prefecture.php b/src/Geo/Japan/Prefecture.php
@@ -112,27 +112,27 @@ class Prefecture
     /**
      * @var string
      */
-    private $isoCode;
+    protected $isoCode;
 
     /**
      * @var string
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      */
-    private $kanjiName;
+    protected $kanjiName;
 
     /**
      * @var PrefectureSuffix
      */
-    private $suffix;
+    protected $suffix;
 
     /**
      * @var Region
      */
-    private $region;
+    protected $region;
 
     /**
      * @param string $isoCode
@@ -141,7 +141,7 @@ class Prefecture
      * @param PrefectureSuffix $suffix
      * @param Region $region
      */
-    private function __construct(
+    protected function __construct(
         string $isoCode,
         string $name,
         string $kanjiName,
@@ -172,7 +172,7 @@ public static function __callStatic(string $name, array $arguments): self
         $suffixFactoryMethod = $datum['suffix'];
         $regionFactoryMethod = $datum['region'];
 
-        return new self(
+        return new static(
             $datum['isoCode'],
             $datum['name'],
             $datum['kanjiName'],
@@ -197,7 +197,7 @@ public static function ofKanjiName(string $kanjiName): self
         $suffixFactoryMethod = $datum['suffix'];
         $regionFactoryMethod = $datum['region'];
 
-        return new self (
+        return new static(
             $datum['isoCode'],
             $datum['name'],
             $datum['kanjiName'],
@@ -229,7 +229,7 @@ public static function ofSuffixedKanjiName(string $suffixedKanjiName): self
         $suffixFactoryMethod = $datum['suffix'];
         $regionFactoryMethod = $datum['region'];
 
-        return new self (
+        return new static(
             $datum['isoCode'],
             $datum['name'],
             $datum['kanjiName'],

diff --git a/src/Geo/Japan/PrefectureSuffix.php b/src/Geo/Japan/PrefectureSuffix.php
@@ -25,18 +25,18 @@ class PrefectureSuffix
     /**
      * @var string
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      */
-    private $kanjiName;
+    protected $kanjiName;
 
     /**
      * @param string $name
      * @param string $kanjiName
      */
-    private function __construct(string $name, string $kanjiName)
+    protected function __construct(string $name, string $kanjiName)
     {
         $this->name = $name;
         $this->kanjiName = $kanjiName;
@@ -57,7 +57,7 @@ public static function __callStatic(string $name, array $arguments): self
         }
         $datum = array_shift($filteredData);
 
-        return new self($datum['name'], $datum['kanjiName']);
+        return new static($datum['name'], $datum['kanjiName']);
     }
 
     /**

diff --git a/src/Geo/Japan/Region.php b/src/Geo/Japan/Region.php
@@ -37,17 +37,18 @@ class Region
     /**
      * @var string
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      */
-    private $kanjiName;
+    protected $kanjiName;
 
     /**
-     * @param array $region
+     * @param string $name
+     * @param string $kanjiName
      */
-    private function __construct(string $name, string $kanjiName)
+    protected function __construct(string $name, string $kanjiName)
     {
         $this->name = $name;
         $this->kanjiName = $kanjiName;
@@ -81,7 +82,7 @@ public static function fromName(string $name): self
             new InvalidArgumentException(sprintf('Invalid region name: %s', $name))
         );
 
-        return new self($datum['name'], $datum['kanjiName']);
+        return new static($datum['name'], $datum['kanjiName']);
     }
 
     /**
@@ -96,7 +97,7 @@ public static function fromKanjiName(string $kanjiName): self
             new InvalidArgumentException(sprintf('Invalid region name in kanji: %s', $kanjiName))
         );
 
-        return new self($datum['name'], $datum['kanjiName']);
+        return new static($datum['name'], $datum['kanjiName']);
     }
 
     /**
@@ -131,7 +132,7 @@ public function equals(self $other): bool
      * @return array
      * @throws Exception
      */
-    private static function filterData(string $key, string $value, Exception $e): array
+    protected static function filterData(string $key, string $value, Exception $e): array
     {
         $filteredData = array_filter(self::DATA, function (array $datum) use ($key, $value) {
             return $value === $datum[$key];
@@ -147,8 +148,8 @@ private static function filterData(string $key, string $value, Exception $e): ar
      * @param array $datum
      * @return self
      */
-    private static function createInstance(array $datum): self
+    protected static function createInstance(array $datum): self
     {
-        return new self($datum['name'], $datum['kanjiName']);
+        return new static($datum['name'], $datum['kanjiName']);
     }
 }
diff --git a/src/Geo/Latitude.php b/src/Geo/Latitude.php
@@ -9,7 +9,7 @@ class Latitude
     /**
      * @var float
      */
-    private $latitude;
+    protected $latitude;
 
     /**
      * @param float $latitude

diff --git a/src/Geo/Longitude.php b/src/Geo/Longitude.php
@@ -9,7 +9,7 @@ class Longitude
     /**
      * @var float
      */
-    private $longitude;
+    protected $longitude;
 
     /**
      * @param float $longitude

diff --git a/src/Geo/Position.php b/src/Geo/Position.php
@@ -7,12 +7,12 @@ class Position
     /**
      * @var Latitude
      */
-    private $latitude;
+    protected $latitude;
 
     /**
      * @var Longitude
      */
-    private $longitude;
+    protected $longitude;
 
     /**
      * @param Latitude $latitude

diff --git a/src/Money/Currency.php b/src/Money/Currency.php
@@ -179,17 +179,17 @@ class Currency
     /**
      * @var string
      */
-    private $isoCode;
+    protected $isoCode;
 
     /**
      * @var int
      */
-    private $decimalPlaces;
+    protected $decimalPlaces;
 
     /**
      * @param string $isoCode
      */
-    private function __construct(string $isoCode)
+    protected function __construct(string $isoCode)
     {
         $this->isoCode = $isoCode;
         if (in_array($isoCode, ['BHD', 'IQD', 'JOD', 'KWD', 'LYD', 'OMR', 'TND'])) {
@@ -210,17 +210,17 @@ private function __construct(string $isoCode)
     /**
      * @param string $name
      * @param array $arguments
-     * @return self
+     * @return Currency
      */
-    public static function __callStatic(string $name, array $arguments)
+    public static function __callStatic(string $name, array $arguments): Currency
     {
         $isoCode = strtoupper($name);
         $name = Intl::getCurrencyBundle()->getCurrencyName($isoCode);
         if (null === $name) {
             throw new InvalidArgumentException(sprintf('Invalid currency code: %s', $isoCode));
         }
 
-        return new self($isoCode);
+        return new static($isoCode);
     }
 
     /**

diff --git a/src/Money/Money.php b/src/Money/Money.php
@@ -9,12 +9,12 @@ class Money
     /**
      * @var int
      */
-    private $amount;
+    protected $amount;
 
     /**
      * @var Currency
      */
-    private $currency;
+    protected $currency;
 
     /**
      * @param int $amount
@@ -52,18 +52,18 @@ public function equals(self $other): bool
     }
 
     /**
-     * @return self
+     * @return Money
      */
-    public function duplicate(): self
+    public function duplicate()
     {
-        return new self($this->amount(), $this->currency());
+        return new static($this->amount(), $this->currency());
     }
 
     /**
      * @param self $other
-     * @return self
+     * @return Money
      */
-    public function add(self $other): self
+    public function add(self $other): Money
     {
         if (!$this->currency()->equals($other->currency())) {
             throw new InvalidArgumentException(
@@ -75,7 +75,7 @@ public function add(self $other): self
             );
         }
 
-        return new self($this->amount() + $other->amount(), $this->currency());
+        return new static($this->amount() + $other->amount(), $this->currency());
     }
 
     /**
@@ -94,7 +94,7 @@ public function sub(self $other): self
             );
         }
 
-        return new self($this->amount() - $other->amount(), $this->currency());
+        return new static($this->amount() - $other->amount(), $this->currency());
     }
 
     /**
@@ -103,7 +103,7 @@ public function sub(self $other): self
      */
     public function multiply(float $multiplier): self
     {
-        return new self(intval(floor($this->amount() * $multiplier)), $this->currency());
+        return new static(intval(floor($this->amount() * $multiplier)), $this->currency());
     }
 
     /**
@@ -121,7 +121,7 @@ public function increaseAmountBy(int $amount): self
             );
         }
 
-        return new self($this->amount() + $amount, $this->currency());
+        return new static($this->amount() + $amount, $this->currency());
     }
 
     /**
@@ -139,6 +139,6 @@ public function decreaseAmountBy(int $amount): self
             );
         }
 
-        return new self($this->amount() - $amount, $this->currency());
+        return new static($this->amount() - $amount, $this->currency());
     }
 }
diff --git a/src/Time/Date.php b/src/Time/Date.php
@@ -12,17 +12,17 @@ class Date
     /**
      * @var int
      */
-    private $year;
+    protected $year;
 
     /**
      * @var int
      */
-    private $month;
+    protected $month;
 
     /**
      * @var int
      */
-    private $day;
+    protected $day;
 
     /**
      * @param int $year