Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Fixed mistaken namespace #242

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Bugfix: Fixed mistaken namespace #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c33a03
Bugfix: Fixed mistaken namespace
nathanbrauer Mar 8, 2024
c328132
Bugfix: Fixed mistaken namespace (tests)
nathanbrauer Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ With auto geocoding enabled in the CMS, the map will display the nearest 26 loca
See the [docs/en](docs/en/index.md) folder.

## Maintainers
* [Dynamic](http://www.dynamicagency.com) (<[email protected]>)
* [Dynamic](https://www.dynamicagency.com) (<[email protected]>)

## Bugtracker
Bugs are tracked in the issues section of this repository. Before submitting an issue please read over
Expand Down
2 changes: 1 addition & 1 deletion _config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Name: locator
---
Dynamic\Locator\Location:
Dynamic\Locator\Model\Location:
extensions:
- Dynamic\SilverStripeGeocoder\DistanceDataExtension
- Dynamic\SilverStripeGeocoder\AddressDataExtension
Expand Down
2 changes: 1 addition & 1 deletion _config/legacy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ name: locatorlegacy
---
SilverStripe\ORM\DatabaseAdmin:
classname_value_remapping:
Dynamic\Locator\Location: Dynamic\Locator\Location
Dynamic\Locator\Location: Dynamic\Locator\Model\Location
Dynamic\Locator\Locator: Dynamic\Locator\Page\Locator
Dynamic\Locator\LocationCategory: Dynamic\Locator\Model\LocationCategory
2 changes: 1 addition & 1 deletion src/Model/Location.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dynamic\Locator;
namespace Dynamic\Locator\Model;

use Dynamic\Locator\Model\LocationCategory;
use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
Expand Down
2 changes: 1 addition & 1 deletion src/Model/LocationCategory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Model;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use Dynamic\Locator\Page\Locator;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\GridField\GridField;
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/EmailAddressTask.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Tasks;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\BuildTask;
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/LocationToPageTask.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Tasks;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use Dynamic\Locator\Page\LocationPage;
use Dynamic\Locator\Page\Locator;
use SilverStripe\Core\Injector\Injector;
Expand Down
2 changes: 1 addition & 1 deletion src/bulkloader/LocationCsvBulkLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Bulkloader;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use Dynamic\Locator\Model\LocationCategory;
use SilverStripe\Dev\CsvBulkLoader;
use SilverStripe\Core\Convert;
Expand Down
4 changes: 2 additions & 2 deletions tests/Model/LocationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Dynamic\Locator\Tests\TestOnlyModel\ExtendedLocation;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\SapphireTest;
use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use SilverStripe\Forms\FieldList;
use SilverStripe\Security\Member;

Expand Down Expand Up @@ -215,7 +215,7 @@ public function testUpdateWebsiteURL()
$clone = Injector::inst()->create(ExtendedLocation::class, $map);
$clone->ID = 0;

$this->assertEquals('http://www.dynamicagency.com', $location->getWebsiteURL());
$this->assertEquals('https://www.dynamicagency.com', $location->getWebsiteURL());
$this->assertEquals('foo', $clone->getWebsiteURL());
}
}
8 changes: 4 additions & 4 deletions tests/Model/locationfixture.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ Dynamic\Locator\Page\Locator:
Title: Locator
Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology

Dynamic\Locator\Location:
Dynamic\Locator\Model\Location:
dynamic:
Title: Dynamic, Inc.
Featured: true
Website: "http://www.dynamicagency.com"
Website: "https://www.dynamicagency.com"
Phone: 920-459-8889
Email: [email protected]
Address: 1526 S. 12th St
Expand All @@ -72,14 +72,14 @@ Dynamic\Locator\Location:
silverstripe:
Title: Silverstripe
Featured: true
Website: http://silverstripe.org
Website: https://silverstripe.org
Phone: 555-555-5555
Email: [email protected]
Categories: =>Dynamic\Locator\Model\LocationCategory.service
3sheeps:
Title: 3 Sheeps Brewing
Featured: false
Website: http://www.3sheepsbrewing.com
Website: https://www.3sheepsbrewing.com
Phone: 555-555-5556
ShowInLocator: false
Address: 1327 Huron Ave
Expand Down
2 changes: 1 addition & 1 deletion tests/Page/LocatorControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Tests\Page;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use Dynamic\Locator\Model\LocationCategory;
use Dynamic\Locator\Page\Locator;
use Dynamic\Locator\Page\LocatorController;
Expand Down
2 changes: 1 addition & 1 deletion tests/Page/LocatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Tests\Page;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use Dynamic\Locator\Page\Locator;
use Dynamic\Locator\Page\LocatorController;
use SilverStripe\Core\Config\Config;
Expand Down
8 changes: 4 additions & 4 deletions tests/Page/locatorfixture.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Dynamic\Locator\Page\Locator:
Title: Locator
Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology

Dynamic\Locator\Location:
Dynamic\Locator\Model\Location:
dynamic:
Title: Dynamic, Inc.
Featured: true
Website: "http://www.dynamicagency.com"
Website: "https://www.dynamicagency.com"
Phone: 920-459-8889
Email: [email protected]
Address: 1526 S. 12th St
Expand All @@ -29,14 +29,14 @@ Dynamic\Locator\Location:
silverstripe:
Title: Silverstripe
Featured: true
Website: http://silverstripe.org
Website: https://silverstripe.org
Phone: 555-555-5555
Email: [email protected]
Categories: =>Dynamic\Locator\Model\LocationCategory.service
3sheeps:
Title: 3 Sheeps Brewing
Featured: false
Website: http://www.3sheepsbrewing.com
Website: https://www.3sheepsbrewing.com
Phone: 555-555-5556
ShowInLocator: false
Address: 1327 Huron Ave
Expand Down
2 changes: 1 addition & 1 deletion tests/TestOnly/Model/ExtendedLocation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Tests\TestOnlyModel;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use Dynamic\Locator\Tests\TestOnly\Extension\LocationExtension;
use SilverStripe\Dev\TestOnly;

Expand Down
14 changes: 7 additions & 7 deletions tests/fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ Dynamic\Locator\Page\Locator:
Title: Locator
Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology

Dynamic\Locator\Location:
Dynamic\Locator\Model\Location:
dynamic:
Title: Dynamic, Inc.
Featured: true
Website: "http://www.dynamicagency.com"
Website: "https://www.dynamicagency.com"
Phone: 920-459-8889
Email: [email protected]
Address: 1526 S. 12th St
Expand All @@ -72,14 +72,14 @@ Dynamic\Locator\Location:
silverstripe:
Title: Silverstripe
Featured: true
Website: http://silverstripe.org
Website: https://silverstripe.org
Phone: 555-555-5555
Email: [email protected]
Categories: =>Dynamic\Locator\Model\LocationCategory.service
3sheeps:
Title: 3 Sheeps Brewing
Featured: false
Website: http://www.3sheepsbrewing.com
Website: https://www.3sheepsbrewing.com
Phone: 555-555-5556
ShowInLocator: false
Address: 1327 Huron Ave
Expand All @@ -103,7 +103,7 @@ Dynamic\Locator\Model\Page\LocationPage:
dynamic:
Title: Dynamic, Inc.
Featured: true
Website: "http://www.dynamicagency.com"
Website: "https://www.dynamicagency.com"
Phone: 920-459-8889
Email: [email protected]
Address: 1526 S. 12th St
Expand All @@ -116,15 +116,15 @@ Dynamic\Locator\Model\Page\LocationPage:
silverstripe:
Title: Silverstripe
Featured: true
Website: http://silverstripe.org
Website: https://silverstripe.org
Phone: 555-555-5555
Email: [email protected]
Categories: =>Dynamic\Locator\Model\LocationCategory.service
Parent: =>Dynamic\Locator\Page\Locator.locator1
3sheeps:
Title: 3 Sheeps Brewing
Featured: false
Website: http://www.3sheepsbrewing.com
Website: https://www.3sheepsbrewing.com
Phone: 555-555-5556
ShowInLocator: false
Address: 1327 Huron Ave
Expand Down
2 changes: 1 addition & 1 deletion tests/form/LocatorFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Dynamic\Locator\Tests\Form;

use Dynamic\Locator\Location;
use Dynamic\Locator\Model\Location;
use Dynamic\Locator\Page\Locator;
use Dynamic\Locator\Page\LocatorController;
use Dynamic\Locator\Form\LocatorForm;
Expand Down
8 changes: 4 additions & 4 deletions tests/form/locatorformfixture.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Dynamic\Locator\Page\Locator:
Title: Locator
Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology

Dynamic\Locator\Location:
Dynamic\Locator\Model\Location:
dynamic:
Title: Dynamic, Inc.
Featured: true
Website: "http://www.dynamicagency.com"
Website: "https://www.dynamicagency.com"
Phone: 920-459-8889
Email: [email protected]
Address: 1526 S. 12th St
Expand All @@ -29,14 +29,14 @@ Dynamic\Locator\Location:
silverstripe:
Title: Silverstripe
Featured: true
Website: http://silverstripe.org
Website: https://silverstripe.org
Phone: 555-555-5555
Email: [email protected]
Categories: =>Dynamic\Locator\Model\LocationCategory.service
3sheeps:
Title: 3 Sheeps Brewing
Featured: false
Website: http://www.3sheepsbrewing.com
Website: https://www.3sheepsbrewing.com
Phone: 555-555-5556
ShowInLocator: false
Address: 1327 Huron Ave
Expand Down
Loading