Changed namespace

lukaskleinschmidt · lukaskleinschmidt · commit 279337403ad2 · 2017-04-04T11:56:58.000+02:00
diff --git a/fields/modules/controller.php b/fields/modules/controller.php
@@ -1,3 +1,3 @@
 <?php
 
-class ModulesFieldController extends Kirby\Sortable\Controllers\Field {}
+class ModulesFieldController extends LukasKleinschmidt\Sortable\Controllers\Field {}
diff --git a/fields/sortable/controller.php b/fields/sortable/controller.php
@@ -1,3 +1,3 @@
 <?php
 
-class SortableFieldController extends Kirby\Sortable\Controllers\Field {}
+class SortableFieldController extends LukasKleinschmidt\Sortable\Controllers\Field {}
diff --git a/fields/sortable/sortable.php b/fields/sortable/sortable.php
@@ -1,6 +1,6 @@
 <?php
 
-use Kirby\Sortable\Sortable;
+use LukasKleinschmidt\Sortable;
 
 // Load all registerd classes
 sortable()->load();
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sortable",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Kirby Sortable",
   "license": "MIT",
   "type": "kirby-plugin",
diff --git a/sortable/actions/add/controller.php b/sortable/actions/add/controller.php
@@ -1,6 +1,6 @@
 <?php
 
-class AddActionController extends Kirby\Sortable\Controllers\Action {
+class AddActionController extends LukasKleinschmidt\Sortable\Controllers\Action {
 
   /**
    * Add a entry
@@ -11,7 +11,7 @@ public function add() {
     $parent = $this->field()->origin();
 
     if($parent->ui()->create() === false) {
-      throw new PermissionsException();
+      throw new Kirby\Panel\Exceptions\PermissionsException();
     }
 
     $form = $this->form('add', array($parent, $this->model(), $this->field()), function($form) use($parent, $self) {
diff --git a/sortable/actions/copy/controller.php b/sortable/actions/copy/controller.php
@@ -1,6 +1,6 @@
 <?php
 
-class CopyActionController extends Kirby\Sortable\Controllers\Action {
+class CopyActionController extends LukasKleinschmidt\Sortable\Controllers\Action {
 
   /**
    * Save to clipboard
diff --git a/sortable/actions/delete/controller.php b/sortable/actions/delete/controller.php
@@ -1,6 +1,6 @@
 <?php
 
-class DeleteActionController extends Kirby\Sortable\Controllers\Action {
+class DeleteActionController extends LukasKleinschmidt\Sortable\Controllers\Action {
 
   /**
    * Delete a entry
@@ -13,7 +13,7 @@ public function delete($uid) {
     $page = $this->field()->entries()->find($uid);
 
     if($page->ui()->delete() === false) {
-      throw new PermissionsException();
+      throw new Kirby\Panel\Exceptions\PermissionsException();
     }
 
     $form = $this->form('delete', array($page, $this->model(), $this->field()), function($form) use($page, $self) {
diff --git a/sortable/actions/duplicate/controller.php b/sortable/actions/duplicate/controller.php
@@ -1,6 +1,6 @@
 <?php
 
-class DuplicateActionController extends Kirby\Sortable\Controllers\Action {
+class DuplicateActionController extends LukasKleinschmidt\Sortable\Controllers\Action {
 
   /**
    * Duplicate a entry
@@ -15,7 +15,7 @@ public function duplicate($uid, $to) {
     $page    = $entries->find($uid);
 
     if($parent->ui()->create() === false) {
-      throw new PermissionsException();
+      throw new Kirby\Panel\Exceptions\PermissionsException();
     }
 
     $page = $this->copy($page, $parent);
diff --git a/sortable/actions/paste/controller.php b/sortable/actions/paste/controller.php
@@ -1,6 +1,6 @@
 <?php
 
-class PasteActionController extends Kirby\Sortable\Controllers\Action {
+class PasteActionController extends LukasKleinschmidt\Sortable\Controllers\Action {
 
   /**
    * Add from clipboard
@@ -18,7 +18,7 @@ public function paste() {
     $entries = pages($entries);
 
     if($parent->ui()->create() === false) {
-      throw new PermissionsException();
+      throw new Kirby\Panel\Exceptions\PermissionsException();
     }
 
     $form = $this->form('paste', array($parent, $entries, $this->model(), $this->field()), function($form) use($parent, $self) {
diff --git a/sortable/actions/toggle/controller.php b/sortable/actions/toggle/controller.php
@@ -1,6 +1,8 @@
 <?php
 
-class ToggleActionController extends Kirby\Sortable\Controllers\Action {
+use Kirby\Panel\Exceptions\PermissionsException;
+
+class ToggleActionController extends LukasKleinschmidt\Sortable\Controllers\Action {
 
   /**
    * Show page
diff --git a/sortable/bootstrap.php b/sortable/bootstrap.php
@@ -3,16 +3,22 @@
 load([
 
   // main class
-  'kirby\\sortable\\sortable'            => 'sortable.php',
+  'lukaskleinschmidt\\sortable\\sortable' => 'sortable.php',
 
   // global stuff
-  'kirby\\sortable\\registry'            => 'sortable' . DS . 'registry.php',
-  'kirby\\sortable\\roots'               => 'sortable' . DS . 'roots.php',
+  'lukaskleinschmidt\\sortable\\registry' => 'sortable' . DS . 'registry.php',
+  'lukaskleinschmidt\\sortable\\roots'    => 'sortable' . DS . 'roots.php',
 
   // controllers
-  'kirby\\sortable\\controllers\\field'  => 'sortable' . DS . 'controllers' . DS . 'field.php',
-  'kirby\\sortable\\controllers\\action' => 'sortable' . DS . 'controllers' . DS . 'action.php',
+  'lukaskleinschmidt\\sortable\\controllers\\field'  => 'sortable' . DS . 'controllers' . DS . 'field.php',
+  'lukaskleinschmidt\\sortable\\controllers\\action' => 'sortable' . DS . 'controllers' . DS . 'action.php',
 
 ], __DIR__ . DS . 'src' );
 
+class_alias('LukasKleinschmidt\\Sortable\\Sortable', 'LukasKleinschmidt\\Sortable');
+
+// TEMP: Added for convenience because those two classes and namespaces were used in v2.3.1 and below
+class_alias('LukasKleinschmidt\\Sortable\\Controllers\\Field',  'Kirby\\Sortable\\Controllers\\Field');
+class_alias('LukasKleinschmidt\\Sortable\\Controllers\\Action', 'Kirby\\Sortable\\Controllers\\Action');
+
 include(__DIR__ . DS . 'helpers.php');
diff --git a/sortable/helpers.php b/sortable/helpers.php
@@ -1,5 +1,5 @@
 <?php
 
 function sortable() {
-  return Kirby\Sortable\Sortable::instance();
+  return LukasKleinschmidt\Sortable::instance();
 }
diff --git a/sortable/src/sortable.php b/sortable/src/sortable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable;
+namespace LukasKleinschmidt\Sortable;
 
 use A;
 use F;
diff --git a/sortable/src/sortable/controllers/action.php b/sortable/src/sortable/controllers/action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable\Controllers;
+namespace LukasKleinschmidt\Sortable\Controllers;
 
 use Kirby\Panel\View;
 use Kirby\Panel\Snippet;
diff --git a/sortable/src/sortable/controllers/field.php b/sortable/src/sortable/controllers/field.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable\Controllers;
+namespace LukasKleinschmidt\Sortable\Controllers;
 
 use Str;
 use Dir;
@@ -9,7 +9,7 @@
 use Kirby\Panel\Event;
 use Kirby\Panel\Models\Page\Blueprint;
 use Kirby\Panel\Exceptions\PermissionsException;
-use Kirby\Sortable\Sortable;
+use LukasKleinschmidt\Sortable;
 
 class Field extends \Kirby\Panel\Controllers\Field {
 
diff --git a/sortable/src/sortable/registry.php b/sortable/src/sortable/registry.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable;
+namespace LukasKleinschmidt\Sortable;
 
 // Kirby dependencies
 use Exception;
@@ -17,10 +17,10 @@ public function __construct(Kirby $kirby) {
 
     // start the registry entry autoloader
     load([
-      'kirby\\sortable\\registry\\translation' => __DIR__ . DS . 'registry' . DS . 'translation.php',
-      'kirby\\sortable\\registry\\variant'     => __DIR__ . DS . 'registry' . DS . 'variant.php',
-      'kirby\\sortable\\registry\\layout'      => __DIR__ . DS . 'registry' . DS . 'layout.php',
-      'kirby\\sortable\\registry\\action'      => __DIR__ . DS . 'registry' . DS . 'action.php',
+      'lukaskleinschmidt\\sortable\\registry\\translation' => __DIR__ . DS . 'registry' . DS . 'translation.php',
+      'lukaskleinschmidt\\sortable\\registry\\variant'     => __DIR__ . DS . 'registry' . DS . 'variant.php',
+      'lukaskleinschmidt\\sortable\\registry\\layout'      => __DIR__ . DS . 'registry' . DS . 'layout.php',
+      'lukaskleinschmidt\\sortable\\registry\\action'      => __DIR__ . DS . 'registry' . DS . 'action.php',
     ]);
 
   }
@@ -34,9 +34,9 @@ public function __construct(Kirby $kirby) {
    */
   public function entry($type, $subtype = null) {
 
-    $class = 'kirby\\sortable\\registry\\' . $type;
+    $class = 'lukaskleinschmidt\\sortable\\registry\\' . $type;
 
-    if(!class_exists('kirby\\sortable\\registry\\' . $type)) {
+    if(!class_exists('lukaskleinschmidt\\sortable\\registry\\' . $type)) {
       throw new Exception('Unsupported registry entry type: ' . $type);
     }
 
diff --git a/sortable/src/sortable/registry/action.php b/sortable/src/sortable/registry/action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable\Registry;
+namespace LukasKleinschmidt\Sortable\Registry;
 
 use Exception;
 use Kirby;
diff --git a/sortable/src/sortable/registry/layout.php b/sortable/src/sortable/registry/layout.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable\Registry;
+namespace LukasKleinschmidt\Sortable\Registry;
 
 use Exception;
 use Kirby;
diff --git a/sortable/src/sortable/registry/translation.php b/sortable/src/sortable/registry/translation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable\Registry;
+namespace LukasKleinschmidt\Sortable\Registry;
 
 use Exception;
 use Kirby;
diff --git a/sortable/src/sortable/registry/variant.php b/sortable/src/sortable/registry/variant.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable\Registry;
+namespace LukasKleinschmidt\Sortable\Registry;
 
 use Exception;
 use Kirby;
@@ -21,7 +21,7 @@ class Variant extends Kirby\Registry\Entry {
 	 * @param string $root
 	 */
 	public function set($name, $root = null) {
-    // 
+    //
     // $name  = strtolower($name);
     // $files = array();
 
diff --git a/sortable/src/sortable/roots.php b/sortable/src/sortable/roots.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Sortable;
+namespace LukasKleinschmidt\Sortable;
 
 use Obj;
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class ModulesFieldController extends Kirby\Sortable\Controllers\Field {}`
	`3`	`+class ModulesFieldController extends LukasKleinschmidt\Sortable\Controllers\Field {}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class SortableFieldController extends Kirby\Sortable\Controllers\Field {}`
	`3`	`+class SortableFieldController extends LukasKleinschmidt\Sortable\Controllers\Field {}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sortable",`
`3`		`- "version": "2.3.1",`
	`3`	`+ "version": "2.3.2",`
`4`	`4`	`"description": "Kirby Sortable",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"type": "kirby-plugin",`