refactor(core): Remove App from all core namespaces #469

src/flextype/Foundation/Cors.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation;
+namespace Flextype\Foundation;
 
 use function count;
 use function implode;

src/flextype/Foundation/Entries/Entries.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation\Entries;
+namespace Flextype\Foundation\Entries;
 
 use Flextype\Component\Filesystem\Filesystem;
 use function array_merge;
@@ -36,7 +36,7 @@ class Entries
      * @var array
      * @access private
      */
-    private $entry = [];
+    public $entry = [];
 
     /**
      * Current entry create data array

src/flextype/Foundation/Entries/Fields/SlugField.php

@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 if (flextype('registry')->get('flextype.settings.entries.fields.slug.enabled')) {
     flextype('emitter')->addListener('onEntryAfterInitialized', static function () : void {
+
         $parts                                         = explode('/', ltrim(rtrim(flextype('entries')->entry_id, '/'), '/'));
         flextype('entries')->entry['slug'] = isset(flextype('entries')->entry['slug']) ? (string) flextype('entries')->entry['slug'] : (string) end($parts);
     });

src/flextype/Foundation/Flextype.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation;
+namespace Flextype\Foundation;
 
 use Slim\App;
 

src/flextype/Foundation/Media/MediaFiles.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation\Media;
+namespace Flextype\Foundation\Media;
 
 use Flextype\Component\Filesystem\Filesystem;
 use Intervention\Image\ImageManagerStatic as Image;

src/flextype/Foundation/Media/MediaFilesMeta.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation\Media;
+namespace Flextype\Foundation\Media;
 
 use Flextype\Component\Arrays\Arrays;
 use Flextype\Component\Filesystem\Filesystem;

src/flextype/Foundation/Media/MediaFolders.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation\Media;
+namespace Flextype\Foundation\Media;
 
 use Flextype\Component\Filesystem\Filesystem;
 use Slim\Http\Environment;

src/flextype/Foundation/Media/MediaFoldersMeta.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation\Media;
+namespace Flextype\Foundation\Media;
 
 class MediaFoldersMeta
 {

src/flextype/Foundation/Plugins.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Foundation;
+namespace Flextype\Foundation;
 
 use Composer\Semver\Semver;
 use Flextype\Component\Arrays\Arrays;

src/flextype/Support/Collection.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Support;
+namespace Flextype\Support;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;

src/flextype/Support/Helpers/CollectionHelper.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-use Flextype\App\Support\Collection;
+use Flextype\Support\Collection;
 
 if (! function_exists('collect')) {
     /**

src/flextype/Support/Helpers/FlextypeHelper.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-use Flextype\App\Foundation\Flextype;
+use Flextype\Foundation\Flextype;
 
 if (! function_exists('flextype')) {
     /**

src/flextype/Support/Parsers/Markdown.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Support\Parsers;
+namespace Flextype\Support\Parsers;
 
 use function md5;
 

src/flextype/Support/Parsers/Shortcode.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Support\Parsers;
+namespace Flextype\Support\Parsers;
 
 use function md5;
 

src/flextype/Support/Serializers/Frontmatter.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Support\Serializers;
+namespace Flextype\Support\Serializers;
 
 use Flextype\Component\Arrays\Arrays;
 use function array_slice;

src/flextype/Support/Serializers/Json.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Support\Serializers;
+namespace Flextype\Support\Serializers;
 
 use RuntimeException;
 use function defined;

src/flextype/Support/Serializers/Yaml.php

@@ -7,7 +7,7 @@ declare(strict_types=1);
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-namespace Flextype\App\Support\Serializers;
+namespace Flextype\Support\Serializers;
 
 use RuntimeException;
 use Symfony\Component\Yaml\Exception\DumpException as SymfonyYamlDumpException;

src/flextype/bootstrap.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Flextype;
 
-use Flextype\App\Foundation\Flextype;
+use Flextype\Foundation\Flextype;
 use Flextype\Component\Registry\Registry;
 use Flextype\Component\Session\Session;
 use Zeuxisoo\Whoops\Provider\Slim\WhoopsMiddleware;
@@ -64,13 +64,13 @@ include_once 'dependencies.php';
 /**
  * Include API ENDPOINTS
  */
-include_once ROOT_DIR . '/src/flextype/app/Endpoints/Utils/errors.php';
-include_once ROOT_DIR . '/src/flextype/app/Endpoints/Utils/access.php';
-include_once ROOT_DIR . '/src/flextype/app/Endpoints/entries.php';
-include_once ROOT_DIR . '/src/flextype/app/Endpoints/registry.php';
-include_once ROOT_DIR . '/src/flextype/app/Endpoints/files.php';
-include_once ROOT_DIR . '/src/flextype/app/Endpoints/folders.php';
-include_once ROOT_DIR . '/src/flextype/app/Endpoints/images.php';
+include_once ROOT_DIR . '/src/flextype/Endpoints/Utils/errors.php';
+include_once ROOT_DIR . '/src/flextype/Endpoints/Utils/access.php';
+include_once ROOT_DIR . '/src/flextype/Endpoints/entries.php';
+include_once ROOT_DIR . '/src/flextype/Endpoints/registry.php';
+include_once ROOT_DIR . '/src/flextype/Endpoints/files.php';
+include_once ROOT_DIR . '/src/flextype/Endpoints/folders.php';
+include_once ROOT_DIR . '/src/flextype/Endpoints/images.php';
 
 /**
  * Set internal encoding
@@ -100,12 +100,12 @@ date_default_timezone_set(flextype('registry')->get('flextype.settings.timezone'
 /**
  * Init shortocodes
  *
- * Load Flextype Shortcodes from directory /flextype/app/Support/Parsers/Shortcodes/ based on flextype.settings.shortcode.shortcodes array
+ * Load Flextype Shortcodes from directory /flextype/Support/Parsers/Shortcodes/ based on flextype.settings.shortcode.shortcodes array
  */
 $shortcodes = flextype('registry')->get('flextype.settings.shortcode.shortcodes');
 
 foreach ($shortcodes as $shortcode_name => $shortcode) {
-    $shortcode_file_path = ROOT_DIR . '/src/flextype/app/Support/Parsers/Shortcodes/' . str_replace('_', '', ucwords($shortcode_name, '_')) . 'Shortcode.php';
+    $shortcode_file_path = ROOT_DIR . '/src/flextype/Support/Parsers/Shortcodes/' . str_replace('_', '', ucwords($shortcode_name, '_')) . 'Shortcode.php';
     if (! file_exists($shortcode_file_path)) {
         continue;
     }
@@ -116,16 +116,16 @@ foreach ($shortcodes as $shortcode_name => $shortcode) {
 /**
  * Init entries fields
  *
- * Load Flextype Entries fields from directory /flextype/app/Foundation/Entries/Fields/ based on flextype.settings.entries.fields array
+ * Load Flextype Entries fields from directory /flextype/Foundation/Entries/Fields/ based on flextype.settings.entries.fields array
  */
 $entry_fields = flextype('registry')->get('flextype.settings.entries.fields');
 
 foreach ($entry_fields as $field_name => $field) {
-    $entry_field_file_path = ROOT_DIR . '/src/flextype/app/Foundation/Entries/Fields/' . str_replace('_', '', ucwords($field_name, '_')) . 'Field.php';
+    $entry_field_file_path = ROOT_DIR . '/src/flextype/Foundation/Entries/Fields/' . str_replace('_', '', ucwords($field_name, '_')) . 'Field.php';
     if (! file_exists($entry_field_file_path)) {
         continue;
     }
-
+    
     include_once $entry_field_file_path;
 }
 

src/flextype/dependencies.php

@@ -12,18 +12,18 @@ namespace Flextype;
 use Bnf\Slim3Psr15\CallableResolver;
 use Cocur\Slugify\Slugify;
 use Flextype\Component\Strings\Strings;
-use Flextype\App\Foundation\Cors;
-use Flextype\App\Foundation\Entries\Entries;
-use Flextype\App\Foundation\Media\MediaFiles;
-use Flextype\App\Foundation\Media\MediaFilesMeta;
-use Flextype\App\Foundation\Media\MediaFolders;
-use Flextype\App\Foundation\Media\MediaFoldersMeta;
-use Flextype\App\Foundation\Plugins;
-use Flextype\App\Support\Parsers\Markdown;
-use Flextype\App\Support\Parsers\Shortcode;
-use Flextype\App\Support\Serializers\Frontmatter;
-use Flextype\App\Support\Serializers\Json;
-use Flextype\App\Support\Serializers\Yaml;
+use Flextype\Foundation\Cors;
+use Flextype\Foundation\Entries\Entries;
+use Flextype\Foundation\Media\MediaFiles;
+use Flextype\Foundation\Media\MediaFilesMeta;
+use Flextype\Foundation\Media\MediaFolders;
+use Flextype\Foundation\Media\MediaFoldersMeta;
+use Flextype\Foundation\Plugins;
+use Flextype\Support\Parsers\Markdown;
+use Flextype\Support\Parsers\Shortcode;
+use Flextype\Support\Serializers\Frontmatter;
+use Flextype\Support\Serializers\Json;
+use Flextype\Support\Serializers\Yaml;
 use Intervention\Image\ImageManager;
 use League\Event\Emitter;
 use League\Flysystem\Adapter\Local;