Merge branch 'master' into dev

flextype-plugins · Aug 25, 2020 · d7e9e8a · d7e9e8a
2 parents 859c333 + 7c00f54
commit d7e9e8a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
+<a name="1.3.0"></a>
+# [1.3.0](https://github.com/flextype-plugins/form-icon/compare/v1.2.0...v1.3.0) (2020-08-25)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.11
+
 <a name="1.2.0"></a>
-# [1.2.0](https://github.com/flextype-plugins/form-admin/compare/v1.1.2...v1.2.0) (2020-08-19)
+# [1.2.0](https://github.com/flextype-plugins/icon/compare/v1.1.2...v1.2.0) (2020-08-19)
 
 ### Features
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Icon Plugin for <a href="http://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/icon/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/icon/icon.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/github/downloads/flextype-plugins/icon/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.10-green.svg?color=black" 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/icon/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/icon/icon.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/github/downloads/flextype-plugins/icon/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?color=black" 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>
 
 Icon plugin to present [Font Awesome](https://fontawesome.com/) icons set for Flextype.
@@ -14,7 +14,7 @@ The following dependencies need to be installed for Icon Plugin.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.10 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.11 | [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) |
 
 ## Installation

diff --git a/app/Models/Icon.php b/app/Models/Icon.php
@@ -15,17 +15,13 @@
 
 class Icon
 {
-    /**
-     * Flextype Application
-     */
-     protected $flextype;
 
     /**
      * __construct
      */
-     public function __construct($flextype)
+     public function __construct()
      {
-         $this->flextype = $flextype;
+
      }
 
     public static function icon($value = null) : string

diff --git a/dependencies.php b/dependencies.php
@@ -14,4 +14,4 @@
 use Flextype\Plugin\Icon\Twig\IconTwigExtension;
 
 // Add Icon Twig Extension
-$flextype->container('twig')->addExtension(new IconTwigExtension($flextype));
+flextype('twig')->addExtension(new IconTwigExtension());
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Icon",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Icon plugin to present Font Awesome icons set for Flextype.",
   "homepage": "https://flextype.org",
   "author": "Sergey Romanenko",

diff --git a/plugin.yaml b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Icon
-version: 1.2.0
+version: 1.3.0
 description: Icon plugin to present Font Awesome icons set for Flextype.
 icon: fab fa-font-awesome-flag
 author:
@@ -11,5 +11,5 @@ bugs: https://github.com/flextype-plugins/icon/issues
 license: MIT
 
 dependencies:
-  flextype: 0.9.10
+  flextype: 0.9.11
   twig: '>=1.0.0'