Posttypes and taxonomies register upgrade

darrenjacoby · Jan 23, 2021 · 3302825 · 3302825
1 parent e86aba1
commit 3302825
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/src/Application/Support/Posttypes/Register.php b/src/Application/Support/Posttypes/Register.php
@@ -68,10 +68,13 @@ public function setDefaults()
      * @param string $this->config
      */
     public function setSupports()
-    {   
-
+    {
         if ($this->config->has('supports')) {
-            $this->config->put('supports', array_keys($this->config->pull('supports')));
+            $keys = Arr::collect($this->config->get('supports'))->keys()->toArray();
+            $keys = array_map(function ($value) {
+                return str_replace('_', '-', $value);
+            }, $keys);
+            $this->config->put('supports', $keys);
         }
     }
 
@@ -83,10 +86,17 @@ public function setSupports()
      * @param string $this->config
      */
     public function setTaxonomies()
-    {   
+    {
+        $taxonomies = $this->config->has('taxonomies') ? 
+            $this->config->pull('taxonomies') : 
+            false;
+
+        if ($taxonomies) {
+            $taxonomies = is_string($taxonomies) ? 
+                [$taxonomies] : 
+                Arr::collect($taxonomies)->keys()->toArray();
 
-        if ($this->config->has('taxonomies')) {
-            $this->config->put('taxonomies', array_keys($this->config->pull('taxonomies')));
+            $this->config->put('taxonomies', $taxonomies);
         }
     }
 

diff --git a/src/Application/Support/Taxonomies/Register.php b/src/Application/Support/Taxonomies/Register.php
@@ -75,9 +75,13 @@ public function setLabels()
      */
     public function setLinks()
     {
-        $this->links = $this->config->has('links') ?
-            array_keys($this->config->pull('links')) :
+        $links = $this->config->has('links') ? 
+            $this->config->pull('links') : 
             'post';
+
+        $this->links = is_string($links) ? 
+            [$links] : 
+            Arr::collect($links)->keys()->toArray();
     }
 
     /**