- Use correct namespace

- Better compose requirements
silverstripe · Jul 17, 2019 · 2f8da57 · 2f8da57
1 parent 71a92ca
commit 2f8da57
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,6 @@ before_script:
 
   # Install composer dependencies
   - composer validate
-  - composer require --no-update silverstripe/recipe-cms:1.x-dev cwp/starter-theme:2.x-dev silverstripe/fulltextsearch:^3
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:

diff --git a/.upgrade.yml b/.upgrade.yml
@@ -1,2 +1,2 @@
 mappings:
-  FontpickerSiteConfigExtension: SilverStripe\Fontpicker\Extensions\FontpickerSiteConfigExtension
+  FontpickerSiteConfigExtension: SilverStripe\ThemeFontpicker\Extensions\FontpickerSiteConfigExtension
diff --git a/_config/config.yml b/_config/config.yml
@@ -3,4 +3,4 @@ Name: themefontpickerconfig
 ---
 SilverStripe\SiteConfig\SiteConfig:
   extensions:
-    - SilverStripe\Fontpicker\Extensions\FontpickerSiteConfigExtension
+    - SilverStripe\ThemeFontpicker\Extensions\FontpickerSiteConfigExtension
diff --git a/composer.json b/composer.json
@@ -7,8 +7,8 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "silverstripe/framework": "^4.1",
-        "silverstripe/fontpicker": "*"
+        "silverstripe/siteconfig": "^4.4",
+        "silverstripe/fontpicker": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",

diff --git a/src/Extensions/FontpickerSiteConfigExtension.php b/src/Extensions/FontpickerSiteConfigExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Fontpicker\Extensions;
+namespace SilverStripe\ThemeFontpicker\Extensions;
 
 use SilverStripe\Fontpicker\Forms\FontPickerField;
 use SilverStripe\Forms\FieldList;