Merge branch 'release/1.1.14' into v1

nystudio107 · Apr 15, 2021 · 30466d9 · 30466d9
2 parents 7295ac7 + eda356d
commit 30466d9
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 186 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Cookies Changelog
 
+## 1.1.14 - 2021.04.15
+### Changed
+* Move settings from the `composer.json` “extra” to the plugin main class
+
+### Fixed
+* Removed duplicate example for Setting Secure Cookies in the docs (https://github.com/nystudio107/craft-cookies/issues/23)
+
 ## 1.1.13 - 2021.03.31
 ### Added
 * Added Dockerfile & Makefile for building docs

diff --git a/buildchain/package.json b/buildchain/package.json
@@ -30,7 +30,7 @@
     "url": "git+https://github.com/nystudio107/craft-cookies.git"
   },
   "scripts": {
-    "docs": "cd ../docs && rm -f package-lock.json && npm install && npm run docs:build"
+    "docs": "cd ../docs && rm -f package-lock.json && npm install && npm update && npm run docs:build"
   },
   "version": "1.1.13"
 }
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-cookies",
     "description": "A simple plugin for setting and getting cookies from within Craft CMS templates.",
     "type": "craft-plugin",
-    "version": "1.1.13",
+    "version": "1.1.14",
     "keywords": [
         "craft",
         "cms",
@@ -32,13 +32,7 @@
     "extra": {
         "name": "Cookies",
         "handle": "cookies",
-        "schemaVersion": "1.0.0",
-        "hasCpSettings": false,
-        "hasCpSection": false,
         "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-cookies/v1/CHANGELOG.md",
-        "class": "nystudio107\\cookies\\Cookies",
-        "components": {
-            "cookies": "nystudio107\\cookies\\services\\CookiesService"
-        }
+        "class": "nystudio107\\cookies\\Cookies"
     }
 }
diff --git a/docs/docs/README.md b/docs/docs/README.md
@@ -143,20 +143,6 @@ Both of these methods accomplish the same thing:
 
 This function works the same as `getCookie` but it uses `Craft::$app->getRequest()->getCookie()` to retrieve the cookies via Craft. It also utilizes `craft->security` framework to decrypt and validate the cookie contents between requests.
 
-**Example**
-
-```twig
-    {% do getSecureCookie('marvin') %}
-    {# Get the cookie using 'getSecureCookie' function #}
-
-    {% do craft.cookies.getSecure('marvin') %}
-    {# Get the cookie using 'getSecure' variable #}
-
-    {% if getSecureCookie('marvin') %}
-        {% set myCookie = getSecureCookie('marvin') %}
-        {{ myCookie }}
-    {% endif %}
-```
 
 ## Deleting cookies