Followup to 5df7c2e, stop loading subdivisions in the ZoneRepository.

commerceguys · Oct 5, 2015 · 685c49b · 685c49b
1 parent d6a00e8
commit 685c49b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 28 deletions.
diff --git a/src/Repository/ZoneRepository.php b/src/Repository/ZoneRepository.php
@@ -21,13 +21,6 @@ class ZoneRepository implements ZoneRepositoryInterface
      */
     protected $definitionPath;
 
-    /**
-     * The subdivision repository.
-     *
-     * @var SubdivisionRepositoryInterface
-     */
-    protected $subdivisionRepository;
-
     /**
      * Zone index.
      *
@@ -45,13 +38,11 @@ class ZoneRepository implements ZoneRepositoryInterface
     /**
      * Creates a ZoneRepository instance.
      *
-     * @param string                         $definitionPath        Path to the zone definitions.
-     * @param SubdivisionRepositoryInterface $subdivisionRepository The subdivision repository.
+     * @param string $definitionPath Path to the zone definitions.
      */
-    public function __construct($definitionPath, SubdivisionRepositoryInterface $subdivisionRepository = null)
+    public function __construct($definitionPath)
     {
         $this->definitionPath = $definitionPath;
-        $this->subdivisionRepository = $subdivisionRepository ?: new SubdivisionRepository();
     }
 
     /**
@@ -164,17 +155,6 @@ protected function createZoneFromDefinition(array $definition)
      */
     protected function createZoneMemberCountryFromDefinition(array $definition)
     {
-        // Load any referenced subdivisions.
-        if (isset($definition['administrative_area'])) {
-            $definition['administrative_area'] = $this->subdivisionRepository->get($definition['administrative_area']);
-        }
-        if (isset($definition['locality'])) {
-            $definition['locality'] = $this->subdivisionRepository->get($definition['locality']);
-        }
-        if (isset($definition['dependent_locality'])) {
-            $definition['dependent_locality'] = $this->subdivisionRepository->get($definition['dependent_locality']);
-        }
-
         $zoneMember = new ZoneMemberCountry();
         $setValues = \Closure::bind(function ($definition) {
             $this->id = $definition['id'];

diff --git a/tests/Repository/ZoneRepositoryTest.php b/tests/Repository/ZoneRepositoryTest.php
@@ -120,12 +120,9 @@ public function testGet($zoneRepository)
         $this->assertEquals('AT', $austriaMember->getCountryCode());
         $this->assertEquals('6691, 6991:6993', $austriaMember->getIncludedPostalCodes());
         $this->assertEquals('123456', $austriaMember->getExcludedPostalCodes());
-        // Test the dummy subdivision values.
-        $subdivisionRepository = new SubdivisionRepository();
-        $subdivision = $subdivisionRepository->get('CH-AG');
-        $this->assertEquals($subdivision, $austriaMember->getAdministrativeArea());
-        $this->assertEquals($subdivision, $austriaMember->getLocality());
-        $this->assertEquals($subdivision, $austriaMember->getDependentLocality());
+        $this->assertEquals('CH-AG', $austriaMember->getAdministrativeArea());
+        $this->assertEquals('CH-AG', $austriaMember->getLocality());
+        $this->assertEquals('CH-AG', $austriaMember->getDependentLocality());
 
         // Test the static cache.
         $sameZone = $zoneRepository->get('de_vat');