feat(settings): update path format

2025-08-06 21:26:48 +02:00 · 2022-06-08 17:14:45 +03:00
parent 12e71eebd6
commit c2294c2940
17 changed files with 23 additions and 21 deletions
--- a/composer.json
+++ b/composer.json
@@ -81,6 +81,8 @@
        "victorjonsson/markdowndocs": "^1.3.8"
    },
    "config": {
+        "apcu-autoloader": true,
+        "optimize-autoloader": true,
        "platform-check": false,
        "sort-packages": true,
        "allow-plugins": {
--- a/src/flextype/core/Entries/Entries.php
+++ b/src/flextype/core/Entries/Entries.php
@@ -124,7 +124,7 @@ class Entries
                continue;
            }
            
-            if (filesystem()->file(ROOT_DIR . $value['path'])->exists()) {
+            if (filesystem()->file(ROOT_DIR . '/' . $value['path'])->exists()) {
                include_once ROOT_DIR . '/' . $value['path']; 
            }
        } 
@@ -140,7 +140,7 @@ class Entries
    public function initDirectives(array $directives): void
    {
        foreach ($directives as $key => $value) {
-            if (filesystem()->file(ROOT_DIR . $value['path'])->exists()) {
+            if (filesystem()->file(ROOT_DIR . '/' . $value['path'])->exists()) {
                include_once ROOT_DIR . '/' . $value['path']; 
            }
        } 
@@ -498,7 +498,7 @@ class Entries

                $currentEntryID = strings($currenEntry->getPath())
                    ->replace('\\', '/')
-                    ->replace(PATH['project'] . $this->options['directory'] . '/', '')
+                    ->replace(PATH['project'] . '/' . $this->options['directory'] . '/', '')
                    ->trim('/')
                    ->toString();

@@ -893,7 +893,7 @@ class Entries
            return $this->registry()->get('methods.getFileLocation.result');
        }

-        return PATH['project'] . $this->options['directory'] . '/' . $this->registry()->get('methods.getFileLocation.params.id') . '/' . $this->registry()->get('methods.getFileLocation.collection.filename') . '.' . $this->registry()->get('methods.getFileLocation.collection.extension');
+        return PATH['project'] . '/' . $this->options['directory'] . '/' . $this->registry()->get('methods.getFileLocation.params.id') . '/' . $this->registry()->get('methods.getFileLocation.collection.filename') . '.' . $this->registry()->get('methods.getFileLocation.collection.extension');
    }

    /**
@@ -924,7 +924,7 @@ class Entries
            return $this->registry()->get('methods.getDirectoryLocation.result');
        }

-        return PATH['project'] . $this->options['directory'] . '/' . $this->registry()->get('methods.getDirectoryLocation.params.id');
+        return PATH['project'] . '/' . $this->options['directory'] . '/' . $this->registry()->get('methods.getDirectoryLocation.params.id');
    }

    /**
--- a/src/flextype/core/Entries/Fields/Default/CreatedAtField.php
+++ b/src/flextype/core/Entries/Fields/Default/CreatedAtField.php
@@ -20,9 +20,9 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    if (! entries()->registry()->get('methods.fetch.collection.fields.created_at.enabled')) {
        return;
    }
-
+    
    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.created_at.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.created_at.path'))) {
        return;
    }
    
--- a/src/flextype/core/Entries/Fields/Default/CreatedByField.php
+++ b/src/flextype/core/Entries/Fields/Default/CreatedByField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesCreate', static function (): void {
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.create.collection.fields.created_by.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.create.collection.fields.created_by.path'))) {
        return;
    }
    
--- a/src/flextype/core/Entries/Fields/Default/IdField.php
+++ b/src/flextype/core/Entries/Fields/Default/IdField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.id.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.id.path'))) {
        return;
    }

--- a/src/flextype/core/Entries/Fields/Default/ModifiedAtField.php
+++ b/src/flextype/core/Entries/Fields/Default/ModifiedAtField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    }
    
    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.modified_at.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.modified_at.path'))) {
        return;
    }

--- a/src/flextype/core/Entries/Fields/Default/PublishedAtField.php
+++ b/src/flextype/core/Entries/Fields/Default/PublishedAtField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.published_at.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.published_at.path'))) {
        return;
    }

--- a/src/flextype/core/Entries/Fields/Default/PublishedByField.php
+++ b/src/flextype/core/Entries/Fields/Default/PublishedByField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesCreate', static function (): void {
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.create.collection.fields.published_by.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.create.collection.fields.published_by.path'))) {
        return;
    }

--- a/src/flextype/core/Entries/Fields/Default/RoutableField.php
+++ b/src/flextype/core/Entries/Fields/Default/RoutableField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.routable.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.routable.path'))) {
        return;
    }

--- a/src/flextype/core/Entries/Fields/Default/SlugField.php
+++ b/src/flextype/core/Entries/Fields/Default/SlugField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.slug.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.slug.path'))) {
        return;
    }
    
--- a/src/flextype/core/Entries/Fields/Default/UuidField.php
+++ b/src/flextype/core/Entries/Fields/Default/UuidField.php
@@ -24,7 +24,7 @@ emitter()->addListener('onEntriesCreate', static function (): void {
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.create.collection.fields.uuid.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.create.collection.fields.uuid.path'))) {
        return;
    }
    
--- a/src/flextype/core/Entries/Fields/Default/VisibilityField.php
+++ b/src/flextype/core/Entries/Fields/Default/VisibilityField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.visibility.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.visibility.path'))) {
        return;
    }
    
--- a/src/flextype/core/Entries/Fields/Tokens/Items/CallsField.php
+++ b/src/flextype/core/Entries/Fields/Tokens/Items/CallsField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesCreate', static function (): void {
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.create.collection.fields.calls.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.create.collection.fields.calls.path'))) {
        return;
    }
    
--- a/src/flextype/core/Entries/Fields/Tokens/Items/IdField.php
+++ b/src/flextype/core/Entries/Fields/Tokens/Items/IdField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.id.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.fetch.collection.fields.id.path'))) {
        return;
    }

--- a/src/flextype/core/Entries/Fields/Tokens/Items/LimitCallsField.php
+++ b/src/flextype/core/Entries/Fields/Tokens/Items/LimitCallsField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesCreate', static function (): void {
    }
    
    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.create.collection.fields.limit_calls.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.create.collection.fields.limit_calls.path'))) {
        return;
    }

--- a/src/flextype/core/Entries/Fields/Tokens/Items/StateField.php
+++ b/src/flextype/core/Entries/Fields/Tokens/Items/StateField.php
@@ -22,7 +22,7 @@ emitter()->addListener('onEntriesCreate', static function (): void {
    }

    // Determine is the current field file path is the same.
-    if (! strings(__FILE__)->replace(ROOT_DIR, '')->isEqual(entries()->registry()->get('methods.create.collection.fields.state.path'))) {
+    if (! strings(__FILE__)->replace(ROOT_DIR, '')->replaceFirst('/', '')->isEqual(entries()->registry()->get('methods.create.collection.fields.state.path'))) {
        return;
    }
    
--- a/src/flextype/core/Parsers/Shortcodes.php
+++ b/src/flextype/core/Parsers/Shortcodes.php
@@ -117,7 +117,7 @@ final class Shortcodes
                continue;
            }

-            if (! file_exists(ROOT_DIR . $shortcode['path'])) {
+            if (! file_exists(ROOT_DIR . '/' . $shortcode['path'])) {
                continue;
            }