Merge branch 'dev'

flextype · Dec 1, 2019 · 3a3c5cb · 3a3c5cb
2 parents 0faec07 + dc4d82e
commit 3a3c5cb
Show file tree

Hide file tree

Showing 150 changed files with 4,710 additions and 2,247 deletions.
diff --git a/.htaccess b/.htaccess
@@ -12,6 +12,7 @@
 # php_value max_execution_time 90
 # php_value max_input_time 120
 # php_value upload_max_filesize 16M
+# php_value realpath_cache_size 16M
 
 <IfModule mod_rewrite.c>
 
@@ -53,7 +54,7 @@ RewriteRule .* index.php [L]
 RewriteRule ^(\.git|flextype)/(.*) error [F]
 # Block access to specific file types for these system folders
 RewriteRule ^(flextype|vendor)/(.*)\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|sh|bat)$ error [F]
-# Block access to specific file types for these user folders
+# Block access to specific file types for these site folders
 RewriteRule ^(site)/(.*)\.(txt|md|yaml|yml|html|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block all direct access to .md files:
 RewriteRule \.md$ error [F]

diff --git a/BACKERS.md b/BACKERS.md
@@ -6,3 +6,4 @@ However, the amount of effort needed to maintain and develop new features for th
 
 - [Become a backer or sponsor on Patreon](https://www.patreon.com/awilum).
 - [One-time donation via PayPal, QIWI, Sberbank, Yandex](http://flextype.org/en/one-time-donation)
+- [Visit our Sponsors & Backers page](http://flextype.org/en/sponsors)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,178 @@
+<a name="0.9.6"></a>
+# [0.9.6](https://github.com/flextype/flextype/compare/v0.9.5...v0.9.6) (2019-12-01)
+
+### Bug Fixes
+
+* **admin-plugin:** fix issue with saving entry source #251
+* **admin-plugin:** fix file browser styles
+* **admin-plugin:** fix breadcrumbs for theme templates
+* **core:** Entries API - fix Collection Undefined Index(s) for fetchAll method #243
+* **core:** fix broken logic for form inputs without labels #274
+* **core:** fix default and site settings loading #297
+* **core:** fix id's names for all generated fields #277
+* **core:** fix notice undefined index: created_at in Entries API
+* **core:** fix notice undefined index: published_at in Entries API #265
+* **core:** fix Plugins API - createPluginsDictionary method and increase app perfomance #259
+* **core:** fix state of active tabs for all generated forms #276
+* **core:** fix state of aria-selected for all generated forms #275  
+
+
+### Features
+
+* **core:** add ability to hide title for hidden fields #240
+* **core:** add new public method delete() for Cache #308
+* **core:** add CacheTwigExtension #309  
+
+    usage in templates:
+    ```
+    {{ cache.CACHE_PUBLIC_METHOD }}
+    ```
+
+* **core:** add ability to override plugins default manifest and settings #224
+* **core:** add ability to override themes default manifest and settings #256
+* **core:** add ability to set help text for generated form controls #283  
+
+    usage in fieldsets:
+    ```
+    help: "Help text here"
+    ```
+
+* **core:** add ability to store entry system fields in entries create method #247
+* **core:** add alternative comparison syntax for Entries API  
+
+    Alternative comparison syntax:
+    ```
+    eq - Equals
+    neq - Not equals
+    lt - Lower than
+    lte - Lower than or equal to
+    gt - Greater than
+    gte - Greater than or equal to
+    ```  
+    docs: http://docs.flextype.org/en/themes/entries-fetch
+
+* **core:** add `json_encode` and `json_decode` twig filter #289  
+
+    usage in templates:
+    ```
+    // Result: {"title": "Hello World!"}
+    {{ {'title': 'Hello World!'}|json_encode }}
+
+    // Result: Hello World!
+    {{ '{"title": "Hello World!"}'|json_decode.title }}
+    ```
+
+* **core:** add parser twig extension #262
+* **core:** add new field property `default` instead of `value` #303
+* **core:** add `yaml_encode` and `yaml_decode` twig filter #290  
+
+    usage in templates:
+    ```
+    // Result: title: 'Hello World!'
+    {{ {'title': 'Hello World!'}|yaml_encode }}
+
+    // Result: Hello World!
+    {{ 'title: Hello World!'|yaml_decode.title }}
+    ```
+
+* **core:** Markdown parsing should be cached in production #287
+* **core:** YAML parsing will be cached in production #263
+* **core:** Refactor entries fetch methods naming #315  
+
+    we have:  
+    `fetch` - for single and collection entries request  
+    `fetchSingle` - for single entry request.   
+    `fetchCollection` - for collection entries request.  
+
+* **core:** add routable option for entries #284  
+
+    usage in entry:
+    ```
+    routable: false
+    ```
+    by default `routable` is `true`
+
+* **admin-plugin:** add help text for common form controls #280
+* **admin-plugin:** add icons for settings tabs sections #293
+* **admin-plugin:** hide textarea control for codemirror editor #279
+* **admin-plugin:** show themes title instead of themes id's on settings page #187
+* **admin-plugin:** add ability to set individual icons #250
+* **admin-plugin:** add ability to set individual icons for plugins #255
+* **admin-plugin:** add ability to work with entry custom fieldset #246
+* **admin-plugin:** add individual icons for snippets #253
+* **admin-plugin:** add individual icons for templates and partials #254
+* **admin-plugin:** add plugins settings page #258
+* **admin-plugin:** add themes settings page #296
+* **admin-plugin:** show message on plugins page if no plugins installed #294
+* **admin-plugin:** use dots icon for actions dropdown #292
+* **admin-plugin:** add auto generated slugs from title field #305
+* **admin-plugin:** add help tooltips #306
+* **admin-plugin:** store Entires/Collections counter in cache #203
+* **admin-plugin:** YAML parsing will be cached in production #263
+* **admin-plugin:** add ability to hide fieldsets from entries type select #304  
+
+    usage in fieldsets:
+    ```
+    hide: true
+    ```
+    by default `hide` is `false`
+
+* **site-plugin:** add routable option for entries #284  
+
+
+### Performance Improvements
+
+* **core:** add realpath_cache_size to .htaccess
+* **core:** improve Plugins API - locales loading and increase app performance #259
+* **core:** improve Cache on production and increase app performance #290 #263  
+
+
+### Vendor Updates
+* **core:** Update vendor flextype-components/date to 1.0.0
+* **core:** Update vendor symfony/yaml to 4.4.0
+* **core:** Update vendor doctrine/cache to 1.10.0
+* **core:** Update vendor doctrine/collections to 1.6.4
+* **core:** Update vendor monolog/monolog to 3.12.3
+* **core:** Update vendor bootstrap to 4.4.1
+* **admin-plugin:** Update vendor bootstrap to 4.4.1
+* **admin-plugin:** Update vendor trumbowyg to 2.20.0  
+
+
+### BREAKING CHANGES
+
+* **core:** method fetchAll removed! please use `fetch`, `fetchSingle` or `fetchCollection`
+* **core:** changed and_where & or_where execution in the templates  
+
+    FROM
+
+    ```
+    'and_where': {
+
+    }
+
+    'or_where': {
+
+    }
+    ```
+
+    TO
+
+    ```
+    'and_where': [
+        {
+
+        }
+    ]
+
+    'or_where': [
+        {
+
+        }
+    ]
+    ```
+
+* **core:** Rename property `value` to `default` for all fieldsets where it is used.
+
 <a name="0.9.5"></a>
 # [0.9.5](https://github.com/flextype/flextype/compare/v0.9.4...v0.9.5) (2019-09-21)
 ### Bug Fixes

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,10 +1,10 @@
 ## CONTRIBUTE
 Flextype is an open source project and community contributions are essential to its growing and success. Contributing to the Flextype is easy and you can give as little or as much time as you want.
 
-* Help on the [Communities.](http://flextype.org/en/community)
-* Develop a new plugin.
-* Create a new theme.
-* Find and [report issues.](https://github.com/flextype/flextype/issues)
-* Link back to [Flextype](http://flextype.org).
-* [Donate to keep Flextype free.](http://flextype.org/en/about)
-* [Join Flextype International Translator Team](https://crowdin.com/project/flextype/invite)
+- Help on the [Communities.](http://flextype.org/en/community)
+- Develop a new plugin.
+- Create a new theme.
+- Find and [report issues.](https://github.com/flextype/flextype/issues)
+- Link back to [Flextype](http://flextype.org).
+- [Donate to keep Flextype free.](http://flextype.org/en/sponsors)
+- [Join Flextype International Translator Team](http://flextype.org/en/international-translator-team)
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 
 <p align="center">
 <a href="https://github.com/flextype/flextype/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype/flextype.svg?label=version"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/github/downloads/flextype/flextype/total.svg?colorB=blue" alt="Total downloads"></a> <a href="https://crowdin.com/project/flextype"><img src="https://d322cqt584bo4o.cloudfront.net/flextype/localized.svg" alt="Crowdin"></a> <a href="https://scrutinizer-ci.com/g/flextype/flextype?branch=master"><img src="https://img.shields.io/scrutinizer/g/flextype/flextype.svg?branch=master" alt="Quality Score"></a> <a href="https://discordapp.com/invite/CCKPKVG"><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat" alt="Discord"></a>
-
 </p>
 
 <h1 align="center">Supporting Flextype</h1>
@@ -13,12 +12,13 @@ However, the amount of effort needed to maintain and develop new features for th
 
 - [Become a backer or sponsor on Patreon](https://www.patreon.com/awilum).
 - [One-time donation via PayPal, QIWI, Sberbank, Yandex](http://flextype.org/en/one-time-donation)
+- [Visit our Sponsors & Backers page](http://flextype.org/en/sponsors)
 
 ## INTRODUCTION
 
 Flextype was **founded in March 2018** as lightweight alternative to other heavy and outdated CMS. Many people use complex solutions for simple pages, unnecessarily. Building this content management system, we focused on simplicity - even novice webmaster adapt his template and writes his own plugin. To achieve this, we implemented a simple but powerful API's.
 
-With Flextype, you are in complete control. Design your data structure the way you want. Update and share your data with others and teams using version control. Flextype does not require MySQL database, because all the data are collected in a simple files.  Perfect portability when changing your hosting provider. Just copy all the files from one account to another.
+With Flextype, you are in complete control. Design your data structure the way you want. Update and share your data with others and teams using version control. Flextype does not require MySQL database, because all the data are collected in a simple files. Perfect portability when changing your hosting provider. Just copy all the files from one account to another.
 
 The underlying architecture of Flextype is built using well established and best-in-class technologies. This is to ensure that Flextype is simple to use and easy to extend. Some of these key technologies include:
 
@@ -64,62 +64,14 @@ Mobile
 - iOS: Safari 9.1 or later
 - Android: Chrome 4.4 or later
 
-## INSTALLATION
-
-#### Using (S)FTP
-
-[Download the latest version.](http://flextype.org/en/downloads)  
-
-Unzip the contents to a new folder on your local computer, and upload to your webhost using the (S)FTP client of your choice. After you’ve done this, be sure to chmod the following directories (with containing files) to 755(or 777), so they are readable and writable by Flextype:  
-- `site/`
-
-#### Using Composer
-
-You can easily install Flextype with Composer.
-
-```
-composer create-project flextype/flextype
-```
-
-Install vendor libs for Flextype
-```
-composer install
-```
-
-Install vendor libs for Default Theme
-
-```
-cd site/themes/default
-npm install
-gulp
-```
-
-Install vendor libs for Admin Panel plugin
-
-```
-cd site/plugins/admin
-composer install
-npm install
-gulp
-```
-
-Install vendor libs for Site plugin
-
-```
-cd site/plugins/site
-composer install
-npm install
-gulp
-```
-
 ## COMMUNITY
 Flextype is open source, community driven project, and maintained by community!
 
-- [Github Repository](https://github.com/flextype/flextype)
+- [Github](https://github.com/flextype)
 - [Discord](https://discord.gg/CCKPKVG)
+- [Twitter](https://twitter.com/getflextype)
 - [Forum](http://forum.flextype.org)
 - [Vkontakte](https://vk.com/flextype)
-- [Twitter](https://twitter.com/getflextype)
 
 ## CONTRIBUTE
 Flextype is an open source project and community contributions are essential to its growing and success. Contributing to the Flextype is easy and you can give as little or as much time as you want.
@@ -129,8 +81,8 @@ Flextype is an open source project and community contributions are essential to
 - Create a new theme.
 - Find and [report issues.](https://github.com/flextype/flextype/issues)
 - Link back to [Flextype](http://flextype.org).
-- [Donate to keep Flextype free.](http://flextype.org/en/about)
-- [Join Flextype International Translator Team](https://crowdin.com/project/flextype/invite)
+- [Donate to keep Flextype free.](http://flextype.org/en/sponsors)
+- [Join Flextype International Translator Team](http://flextype.org/en/international-translator-team)
 
 ## LICENSE
 [The MIT License (MIT)](https://github.com/flextype/flextype/blob/master/LICENSE.txt)

diff --git a/composer.json b/composer.json
@@ -20,23 +20,23 @@
         "ext-json": "*",
         "ext-mbstring": "*",
 
-        "doctrine/cache": "~1.8.0",
-        "doctrine/collections": "~1.6.2",
+        "doctrine/cache": "~1.10.0",
+        "doctrine/collections": "~1.6.4",
 
         "flextype-components/arr" : "1.2.5",
         "flextype-components/assets" : "1.0.3",
         "flextype-components/cookie" : "1.2.0",
         "flextype-components/date" : "1.1.0",
         "flextype-components/debug" : "1.0.0",
         "flextype-components/filesystem" : "2.0.6",
-        "flextype-components/i18n" : "1.2.0",
+        "flextype-components/i18n" : "1.3.0",
         "flextype-components/number" : "1.1.0",
         "flextype-components/registry" : "2.0.0",
         "flextype-components/session" : "1.1.1",
         "flextype-components/text" : "1.1.2",
         "flextype-components/form" : "1.0.2",
 
-        "slim/slim": "~3.12.2",
+        "slim/slim": "~3.12.3",
         "slim/twig-view": "~2.5.0",
         "slim/flash": "~0.4.0",
         "slim/csrf": "~0.8.3",
@@ -48,11 +48,11 @@
         "league/glide": "~1.5.0",
 
         "respect/validation": "~1.1.31",
-        "monolog/monolog": "~2.0.0",
+        "monolog/monolog": "~2.0.1",
         "cocur/slugify": "~3.2.0",
         "thunderer/shortcode": "~0.7.2",
         "ramsey/uuid": "~3.8.0",
-        "symfony/yaml": "~4.3.4",
+        "symfony/yaml": "~4.4.0",
 
         "erusev/parsedown": "~1.7.3",
         "erusev/parsedown-extra": "~0.7.1",
@@ -69,6 +69,7 @@
     },
     "config": {
         "apcu-autoloader": true,
+        "optimize-autoloader": true,
         "platform": {
             "php": "7.2.0"
         }
@@ -80,6 +81,7 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "~6.0.0",
-        "victorjonsson/markdowndocs": "dev-master"
+        "victorjonsson/markdowndocs": "dev-master",
+        "phpstan/phpstan": "^0.11.19"
     }
 }