Site 1.5.0

flextype-plugins · Dec 7, 2020 · d9e6d8d · d9e6d8d
1 parent 45713c2
commit d9e6d8d
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,20 @@
+# Global
+.composer
+composer.lock
+package-lock.json
+vendor/
+node_modules/
+dist/
+
+# Flextype Site Specific
+var/
+
+# OS Generated
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+*.swp
+
+# phpstorm
+.idea/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.5.0"></a>
+# [1.5.0](https://github.com/flextype-plugins/site/compare/v1.4.0...v1.5.0) (2020-12-07)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.12
+
 <a name="1.4.0"></a>
 # [1.4.0](https://github.com/flextype-plugins/site/compare/v1.3.0...v1.4.0) (2020-08-25)
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2020 Sergey Romanenko
+Copyright (c) 2021 Sergey Romanenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Site Plugin for <a href="http://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/site/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/site.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/github/downloads/flextype-plugins/site/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.11-green.svg" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-plugins/site/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/site.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/github/downloads/flextype-plugins/site/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.12-green.svg" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
 </p>
 
 Site plugin to display entries content on the website frontend.
@@ -14,7 +14,7 @@ The following dependencies need to be downloaded and installed for Site Plugin.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.11 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.12 | [download](https://github.com/flextype/flextype/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 | [noir](https://github.com/flextype-themes/noir) | >=1.0.0 | [download](https://github.com/flextype-themes/noir/releases) |
 
@@ -136,4 +136,4 @@ $highlight = flextype('registry')->get('themes.noir.settings.highlight');
 
 ## LICENSE
 [The MIT License (MIT)](https://github.com/flextype-plugins/site/blob/master/LICENSE.txt)
-Copyright (c) 2018-2020 [Sergey Romanenko](https://github.com/Awilum)
+Copyright (c) 2021 [Sergey Romanenko](https://github.com/Awilum)
diff --git a/app/Controllers/SiteController.php b/app/Controllers/SiteController.php
@@ -54,13 +54,13 @@ public function index(Request $request, Response $response, array $args) : Respo
         }
 
         // Get entry body
-        $entry_body = flextype('entries')->fetch($entry_uri);
+        $entry_body = flextype('entries')->fetchSingle($entry_uri)->toArray();
 
         // is entry not found
         $is_entry_not_found = false;
 
         // If entry body is not false
-        if ($entry_body) {
+        if (is_array($entry_body) and count($entry_body) > 0) {
             // Get 404 page if entry visibility is draft or hidden and if routable is false
             if ((isset($entry_body['visibility']) && ($entry_body['visibility'] === 'draft' || $entry_body['visibility'] === 'hidden')) ||
                 (isset($entry_body['routable']) && ($entry_body['routable'] === false))) {

diff --git a/app/Models/Themes.php b/app/Models/Themes.php
@@ -50,8 +50,8 @@ public function init() : void
         $themes_cache_id = $this->getThemesCacheID($themes_list);
 
         // Get themes list from cache or scan themes folder and create new themes cache item in the registry
-        if (flextype('cache')->contains($themes_cache_id)) {
-            flextype('registry')->set('themes', flextype('cache')->fetch($themes_cache_id));
+        if (flextype('cache')->has($themes_cache_id)) {
+            flextype('registry')->set('themes', flextype('cache')->get($themes_cache_id));
         } else {
             $themes                 = [];
             $themes_settings        = [];
@@ -119,7 +119,7 @@ public function init() : void
             flextype('registry')->set('themes', $themes);
 
             // Save parsed themes list in the cache
-            flextype('cache')->save($themes_cache_id, $themes);
+            flextype('cache')->set($themes_cache_id, $themes);
         }
 
         // Emit onThemesInitialized

diff --git a/composer.json b/composer.json
@@ -18,7 +18,9 @@
     "require": {
         "php": ">=7.3.0",
         "ext-json": "*",
-        "middlewares/trailing-slash": "~1.1.0"
+        "middlewares/trailing-slash": "~1.1.0",
+        "flextype-components/arrays" : "3.0.1",
+        "flextype-components/filesystem": "2.0.8"
     },
     "config": {
         "apcu-autoloader": true,

diff --git a/plugin.yaml b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Site
-version: 1.4.0
+version: 1.5.0
 description: Site plugin to display entries content on the website frontend.
 icon: fas fa-globe
 author:
@@ -11,5 +11,5 @@ bugs: https://github.com/flextype-plugins/site/issues
 license: MIT
 
 dependencies:
-  flextype: 0.9.11
+  flextype: 0.9.12
   twig: '>=1.0.0'