Merge branch 'release/1.1.8' into v1

nystudio107 · Mar 12, 2018 · ebc4ea5 · ebc4ea5
2 parents 3d3bbac + b30ac17
commit ebc4ea5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Typogrify Changelog
 
+## 1.1.8 - 2018.03.12
+### Added
+* Fix the `getPhpTypographySettings()` Twig function to be named correctly
+
 ## 1.1.7 - 2018.02.01
 ### Added
 * Renamed the composer package name to `craft-typogrify`

diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nystudio107/craft-typogrify/badges/quality-score.png?b=v1)](https://scrutinizer-ci.com/g/nystudio107/craft-typogrify/?branch=v1)[![Code Coverage](https://scrutinizer-ci.com/g/nystudio107/craft-typogrify/badges/coverage.png?b=v1)](https://scrutinizer-ci.com/g/nystudio107/craft-typogrify/?branch=v1)[![Build Status](https://scrutinizer-ci.com/g/nystudio107/craft-typogrify/badges/build.png?b=v1)](https://scrutinizer-ci.com/g/nystudio107/craft-typogrify/build-status/v1)[![Code Intelligence Status](https://scrutinizer-ci.com/g/nystudio107/craft-typogrify/badges/code-intelligence.svg?b=v1)](https://scrutinizer-ci.com/code-intelligence)
+
 # Typogrify plugin for Craft CMS 3.x
 
 Typogrify prettifies your web typography by preventing ugly quotes and 'widows' and more

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-typogrify",
     "description": "Typogrify prettifies your web typography by preventing ugly quotes and 'widows' and more",
     "type": "craft-plugin",
-    "version": "1.1.7",
+    "version": "1.1.8",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/twigextensions/TypogrifyTwigExtension.php b/src/twigextensions/TypogrifyTwigExtension.php
@@ -65,7 +65,7 @@ public function getFunctions()
             new \Twig_SimpleFunction('typogrify', [$this, 'typogrify']),
             new \Twig_SimpleFunction('typogrifyFeed', [$this, 'typogrifyFeed']),
             new \Twig_SimpleFunction('smartypants', [$this, 'smartypants']),
-            new \Twig_SimpleFunction('getPhpTypography', [$this, 'getPhpTypography']),
+            new \Twig_SimpleFunction('getPhpTypographySettings', [$this, 'getPhpTypographySettings']),
             new \Twig_SimpleFunction('truncate', [$this, 'truncate']),
             new \Twig_SimpleFunction('truncateOnWord', [$this, 'truncateOnWord']),
             new \Twig_SimpleFunction('stringy', [$this, 'stringy']),