Fix filenames processors

.gitignore

@@ -1,2 +1,10 @@
 _build/build.config.php
 config.core.php
+
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

_build/build.schema.php

@@ -34,11 +34,11 @@
 define('PKG_NAME_LOWER', strtolower(PKG_NAME));
 
 // Define sources
-$root = dirname(dirname(__FILE__)).'/';
+$root = dirname(__FILE__, 2).'/';
 $sources = array(
     'root'   => $root,
     'core'   => $root . 'core/components/' . PKG_NAME_LOWER . '/',
-    'model'  => $root . 'core/components/' . PKG_NAME_LOWER . '/model/',
+    'model'  => $root . 'core/components/' . PKG_NAME_LOWER . '/src/',
     'assets' => $root . 'assets/components/' . PKG_NAME_LOWER . '/',
 );
 
@@ -47,7 +47,6 @@
 include_once MODX_CORE_PATH . 'model/modx/modx.class.php';
 $modx = new modX();
 $modx->initialize('mgr');
-$modx->loadClass('transport.modPackageBuilder', '', false, true);
 
 // Used for nice formatting of log messages
 echo '<pre>';
@@ -57,30 +56,10 @@
 $manager   = $modx->getManager();
 $generator = $manager->getGenerator();
 
-$generator->classTemplate= <<<EOD
-<?php
-/**
- * [+phpdoc-package+]
- */
-class [+class+] extends [+extends+] {}
-?>
-EOD;
-$generator->platformTemplate= <<<EOD
-<?php
-/**
- * [+phpdoc-package+]
- */
-require_once (strtr(realpath(dirname(dirname(__FILE__))), '\\\\', '/') . '/[+class-lowercase+].class.php');
-class [+class+]_[+platform+] extends [+class+] {}
-?>
-EOD;
-$generator->mapHeader= <<<EOD
-<?php
-/**
- * [+phpdoc-package+]
- */
-EOD;
-$generator->parseSchema($sources['model'] . 'schema/'.PKG_NAME_LOWER.'.mysql.schema.xml', $sources['model']);
+
+$generator->parseSchema($sources['core'] . '/model/schema/'.PKG_NAME_LOWER.'.mysql.schema.xml', $sources['model'], ['namespacePrefix' => 'faqMan']);
+//$manager->createObjectContainer('faqMan\Model\faqManItem');
+
 
 $mtime     = microtime();
 $mtime     = explode(" ", $mtime);

_build/build.transport.php

@@ -23,6 +23,9 @@
  * @package faqman
  * @subpackage build
  */
+
+use MODX\Revolution\Transport\modPackageBuilder;
+
 $mtime  = microtime();
 $mtime  = explode(' ', $mtime);
 $mtime  = $mtime[1] + $mtime[0];
@@ -32,7 +35,7 @@
 // Define package
 define('PKG_NAME','faqMan');
 define('PKG_NAME_LOWER',strtolower(PKG_NAME));
-define('PKG_VERSION','2.0.1');
+define('PKG_VERSION','2.0.2');
 define('PKG_RELEASE','pl');
 
 // Define sources

assets/components/faqman/connector.php

@@ -22,18 +22,19 @@
  *
  * @package faqman
  */
-require_once dirname(dirname(dirname(dirname(__FILE__)))).'/config.core.php';
+if (!@include_once dirname(__FILE__, 5).'/config.core.php') {
+    require_once dirname(__FILE__, 4).'/config.core.php';
+}
 require_once MODX_CORE_PATH.'config/'.MODX_CONFIG_KEY.'.inc.php';
 require_once MODX_CONNECTORS_PATH.'index.php';
 
 $corePath = $modx->getOption('faqman.core_path',null,$modx->getOption('core_path').'components/faqman/');
-require_once $corePath.'model/faqman/faqman.class.php';
-$modx->faqman = new faqMan($modx);
+$modx->faqman = $modx->services->get('faqMan');
 
 $modx->lexicon->load('faqman:default');
 
 /* handle request */
-$path = $modx->getOption('processorsPath',$modx->faqman->config,$corePath.'processors/');
+$path = $modx->getOption('processorsPath',$modx->faqman->config,$corePath.'src/Processors/');
 $modx->request->handleRequest(array(
     'processors_path' => $path,
     'location' => '',

assets/components/faqman/js/mgr/widgets/items.grid.js

@@ -11,7 +11,7 @@ Faqman.grid.Items = function(config) {
         id: 'faqman-grid-items'
         ,url: Faqman.config.connectorUrl
         ,baseParams: {
-            action: 'mgr/item/getList'
+            action: 'faqMan\\Processors\\Mgr\\Item\\getList'
             ,set: config.setid
         }
         ,fields: ['id', 'question', 'answer', 'set', 'rank', 'actions']
@@ -222,7 +222,7 @@ Ext.extend(Faqman.grid.Items,MODx.grid.Grid,{
             ,text: _('faqman.item_remove_confirm')
             ,url: Faqman.config.connectorUrl
             ,params: {
-                action: 'mgr/item/remove'
+                action: 'faqMan\\Processors\\Mgr\\Item\\Remove'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -239,7 +239,7 @@ Ext.extend(Faqman.grid.Items,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: Faqman.config.connectorUrl
             ,params: {
-                action: 'mgr/item/publish'
+                action: 'faqMan\\Processors\\Mgr\\Item\\Publish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -254,7 +254,7 @@ Ext.extend(Faqman.grid.Items,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: Faqman.config.connectorUrl
             ,params: {
-                action: 'mgr/item/unpublish'
+                action: 'faqMan\\Processors\\Mgr\\Item\\Unpublish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -305,7 +305,7 @@ Faqman.window.CreateItem = function(config) {
         ,url: Faqman.config.connectorUrl
         ,closeAction: 'close'
         ,baseParams: {
-            action: 'mgr/item/create'
+            action: 'faqMan\\Processors\\Mgr\\Item\\Create'
             ,set: config.set
         }
         ,fields: [{
@@ -343,7 +343,7 @@ Faqman.window.UpdateItem = function(config) {
         ,width: 650
         ,modal: true
         ,url: Faqman.config.connectorUrl
-        ,action: 'mgr/item/update'
+        ,action: 'faqMan\\Processors\\Mgr\\Item\\Update'
         ,closeAction: 'close'
         ,fields: [{
             xtype: 'hidden'

assets/components/faqman/js/mgr/widgets/sets.grid.js

@@ -19,7 +19,7 @@ Faqman.grid.Sets = function(config) {
     Ext.applyIf(config,{
         id: 'faqman-grid-sets'
         ,url: Faqman.config.connectorUrl
-        ,baseParams: { action: 'mgr/set/getList' }
+        ,baseParams: { action: 'faqMan\\Processors\\Mgr\\Set\\getList' }
         ,fields: ['id','name','description','rank', 'published']
         ,autoHeight: true
         ,paging: true
@@ -28,7 +28,7 @@ Faqman.grid.Sets = function(config) {
         ,remoteSort: true
         ,anchor: '97%'
         ,autoExpandColumn: 'name'
-        ,save_action: 'mgr/set/updateFromGrid'
+        ,save_action: 'faqMan\\Processors\\Mgr\\Set\\UpdateFromGrid'
         ,autosave: true
         ,view: gridView
         ,columns: [
@@ -95,7 +95,7 @@ Ext.extend(Faqman.grid.Sets,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: this.config.url
             ,params: {
-                action: 'mgr/set/sort'
+                action: 'faqMan\\Processors\\Mgr\\Set\\Sort'
                 ,source: o.source.id
                 ,target: o.target.id
             }
@@ -190,7 +190,7 @@ Ext.extend(Faqman.grid.Sets,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: this.config.url
             ,params: {
-                action: 'mgr/set/publish'
+                action: 'faqMan\\Processors\\Mgr\\Set\\Publish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -207,7 +207,7 @@ Ext.extend(Faqman.grid.Sets,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: this.config.url
             ,params: {
-                action: 'mgr/set/unpublish'
+                action: 'faqMan\\Processors\\Mgr\\Set\\Unpublish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -248,7 +248,7 @@ Faqman.window.CreateSet = function(config) {
         ,width: 475
         ,modal: true
         ,url: Faqman.config.connectorUrl
-        ,action: 'mgr/set/create'
+        ,action: 'faqMan\\Processors\\Mgr\\Set\\Create'
         ,fields: [{
             xtype: 'textfield'
             ,fieldLabel: _('name')
@@ -276,7 +276,7 @@ Faqman.window.UpdateSet = function(config) {
         ,width: 475
         ,modal: true
         ,url: Faqman.config.connectorUrl
-        ,action: 'mgr/set/update'
+        ,action: 'faqMan\\Processors\\Mgr\\Set\\Update'
         ,fields: [{
             xtype: 'hidden'
             ,name: 'id'

core/components/faqman/bootstrap.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * @var \MODX\Revolution\modX $modx
+ * @var array $namespace
+ */
+
+require_once $namespace['path'] . 'vendor/autoload.php';
+
+$modx->addPackage('faqMan\Model', $namespace['path'] . 'src/', null, 'faqMan\\');
+
+$modx->services->add('faqMan', function() use ($modx) {
+    return new faqMan\faqMan($modx);
+});

core/components/faqman/composer.json

@@ -0,0 +1,7 @@
+{
+  "autoload": {
+    "psr-4": {
+      "faqMan\\": "src/"
+    }
+  }
+}

core/components/faqman/controllers/index.class.php

@@ -21,11 +21,10 @@
  * @package faqman
  * @subpackage controllers
  */
-require_once dirname(dirname(__FILE__)).'/model/faqman/faqman.class.php';
-class FaqmanIndexManagerController extends \modExtraManagerController {
+class FaqmanIndexManagerController extends modExtraManagerController {
     public $faqman;
     public function initialize() {
-        $this->faqman = new faqMan($this->modx);
+        $this->faqman = $this->modx->services->get('faqMan');
         $this->addCss($this->faqman->config['cssUrl'].'mgr.css');
         $this->addJavascript($this->faqman->config['jsUrl'].'mgr/faqman.js');
         $this->addHtml('<script>

core/components/faqman/elements/snippets/snippet.faqman.php

@@ -4,13 +4,11 @@
  *
  * @package faqman
  */
-$faqMan = $modx->getService(
-    'faqman',
-    'faqMan',
-    $modx->getOption('faqman.core_path', null, $modx->getOption('core_path').'components/faqman/').'model/faqman/',
-    $scriptProperties
-);
-if (!($faqMan instanceof faqMan)) return '';
+use \faqMan\Model\faqManSet;
+use \faqMan\Model\faqManItem;
+
+$faqMan = $modx->services->get('faqMan');
+if (!($faqMan instanceof \faqMan\faqMan)) return '';
 
 $set                = $modx->getOption('set', $scriptProperties, null);
 $sets               = $modx->getOption('sets', $scriptProperties, null);
@@ -26,7 +24,7 @@
 $setOutputSeparator = $modx->getOption('setOutputSeparator', $scriptProperties, "\n");
 
 /* build query */
-$c = $modx->newQuery('faqManSet');
+$c = $modx->newQuery(faqManSet::class);
 
 if (!empty($set)) {
     $c->where(array(
@@ -48,7 +46,7 @@
 if (!empty($limit)) $c->limit($limit);
 
 // Get collection of FAQ sets based on query
-$sets = $modx->getCollection('faqManSet', $c);
+$sets = $modx->getCollection(faqManSet::class, $c);
 
 // Loop through found FAQ sets and build the output
 $list = array();
@@ -58,7 +56,7 @@
     $setArray = $set->toArray();
 
     // Loop through items and set output to array
-    $ci = $modx->newQuery('faqManItem');
+    $ci = $modx->newQuery(faqManItem::class);
 
     // Hide unpublished items
     if (!$showUnpublished) {