Merge branch 'develop'

src/Components/AreaComponent.php

@@ -66,6 +66,14 @@ class AreaComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/AreaComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_AreaComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/BaseComponent.php

@@ -33,6 +33,22 @@
  */
 class BaseComponent extends Component
 {
+    /**
+     * Human-readable singular name.
+     *
+     * @var string
+     * @config
+     */
+    private static $singular_name = 'Base Component';
+
+    /**
+     * Human-readable plural name.
+     *
+     * @var string
+     * @config
+     */
+    private static $plural_name = 'Base Components';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *
@@ -41,6 +57,14 @@ class BaseComponent extends Component
      */
     private static $hide_ancestor = Component::class;
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_BaseComponent';
+
     /**
      * Maps field names to field types for this object.
      *

src/Components/BaseListComponent.php

@@ -67,6 +67,14 @@ class BaseListComponent extends BaseComponent
     const BUTTON_TYPE_LINK   = 'link';
     const BUTTON_TYPE_BUTTON = 'button';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_BaseListComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/ContentComponent.php

@@ -65,6 +65,14 @@ class ContentComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/ContentComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_ContentComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/CopyrightComponent.php

@@ -70,6 +70,14 @@ class CopyrightComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/CopyrightComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_CopyrightComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/DeveloperComponent.php

@@ -69,6 +69,14 @@ class DeveloperComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/DeveloperComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_DeveloperComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/FeatureComponent.php

@@ -75,6 +75,14 @@ class FeatureComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/FeatureComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_FeatureComponent';
+
     /**
      * Maps field names to field types for this object.
      *

src/Components/HeadingComponent.php

@@ -63,6 +63,14 @@ class HeadingComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/HeadingComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_HeadingComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/ImageComponent.php

@@ -67,6 +67,14 @@ class ImageComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/ImageComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_ImageComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/ListComponent.php

@@ -65,6 +65,14 @@ class ListComponent extends BaseListComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/ListComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_ListComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/MediaComponent.php

@@ -99,6 +99,14 @@ class MediaComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/MediaComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_MediaComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/PageComponent.php

@@ -63,6 +63,14 @@ class PageComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/PageComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_PageComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/ScrollToTopButton.php

@@ -69,6 +69,14 @@ class ScrollToTopButton extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/ScrollToTopButton.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_ScrollToTopButton';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/TableComponent.php

@@ -66,6 +66,14 @@ class TableComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/TableComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_TableComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/TagCloudComponent.php

@@ -74,6 +74,14 @@ class TagCloudComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/TagCloudComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_TagCloudComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Components/TileComponent.php

@@ -59,4 +59,12 @@ class TileComponent extends BaseListComponent
      * @config
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/TileComponent.png';
+
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_TileComponent';
 }

src/Components/TitleComponent.php

@@ -62,6 +62,14 @@ class TitleComponent extends BaseComponent
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/TitleComponent.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_TitleComponent';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *

src/Core/App.php

@@ -37,6 +37,30 @@
  */
 class App extends DataObject
 {
+    /**
+     * Human-readable singular name.
+     *
+     * @var string
+     * @config
+     */
+    private static $singular_name = 'App';
+
+    /**
+     * Human-readable plural name.
+     *
+     * @var string
+     * @config
+     */
+    private static $plural_name = 'Apps';
+
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_App';
+
     /**
      * Defines the injector dependencies for this object.
      *

src/Dev/FixtureBlueprint.php

@@ -207,7 +207,7 @@ public function findOrMakeObject($identifier, $data = null, $fixtures = null, $f
 
         // Mutate Class (if required):
 
-        $this->mutateClass($object, $identifier, $data);
+        $object = $this->mutateClass($object, $identifier, $data);
 
         // Write Object to Database:
 
@@ -255,6 +255,10 @@ public function findObjects($identifier, $data, $filter)
     {
         $objects = DataList::create($this->getClass());
 
+        if (!$objects->exists()) {
+            $objects = DataList::create($this->getBaseClass());
+        }
+
         if (is_array($filter)) {
             $objects = $objects->filter($filter);
         }

src/Extensions/Model/URLSegmentExtension.php

@@ -63,7 +63,7 @@ public function onBeforeWrite()
     {
         // Generate Valid URL Segment:
 
-        $this->generateValidURLSegment($this->getURLSegmentSource());
+        $this->owner->generateValidURLSegment($this->owner->getURLSegmentSource());
     }
 
     /**
@@ -135,13 +135,13 @@ public function generateValidURLSegment($string)
     {
         // Generate URL Segment:
 
-        $this->owner->URLSegment = $this->generateURLSegment($string);
+        $this->owner->URLSegment = $this->owner->generateURLSegment($string);
 
         // Check for Duplicates:
 
         $count = 2;
 
-        while (!$this->validURLSegment()) {
+        while (!$this->owner->validURLSegment()) {
 
             $this->owner->URLSegment = sprintf(
                 '%s-%d',

src/Folders/ComponentFolder.php

@@ -31,6 +31,22 @@
  */
 class ComponentFolder extends Folder
 {
+    /**
+     * Human-readable singular name.
+     *
+     * @var string
+     * @config
+     */
+    private static $singular_name = 'Component Folder';
+
+    /**
+     * Human-readable plural name.
+     *
+     * @var string
+     * @config
+     */
+    private static $plural_name = 'Component Folders';
+
     /**
      * Description of this object.
      *
@@ -47,6 +63,14 @@ class ComponentFolder extends Folder
      */
     private static $icon = 'silverware/silverware: admin/client/dist/images/icons/ComponentFolder.png';
 
+    /**
+     * Defines the table name to use for this object.
+     *
+     * @var string
+     * @config
+     */
+    private static $table_name = 'SilverWare_ComponentFolder';
+
     /**
      * Defines an ancestor class to hide from the admin interface.
      *