1.0.6

Inchoo · Sep 8, 2016 · 717d090 · 717d090
1 parent 879e098
commit 717d090
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # Inchoo_PHP7
 
-PHP 7 compatibility extension for Magento 1 by Inchoo. Article with some tests and stats: http://inchoo.net/magento/its-alive/ .
+PHP 7 compatibility extension for Magento 1 core by Inchoo. Article with some tests and stats: [http://inchoo.net/magento/its-alive/](http://inchoo.net/magento/its-alive/).
 
 ## Compatibility
-Tested on M CE 1.9.2.2 - 1.9.2.4. Reported working on M EE 1.14.2.2.
+Tested on M CE 1.9.2.2 - 1.9.2.4 & M EE 1.14.2.2 - 1.14.2.4.
 
 (CE version of extension is in master branch, and EE version is in EE branch.)
 
@@ -13,13 +13,20 @@ If you can, upgrade to freshest Magento core first. If you can't, this may be a
 
 Backwards compatible with PHP. Tested by us on PHP 5.6 & 5.5. Users have reported it working fine even on 5.3.3. Installing the extension before switching to PHP 7 is a good idea.
 
+Read the [Wiki](https://github.com/Inchoo/Inchoo_PHP7/wiki)! It contains a lot of great information and stuff you need to do or know about running M1 on PHP7.
+
+## 3rd party extensions
+May be incompatible with PHP 7. We can't do anything about that. But their authors can.
+
 ## License
 MIT. (See LICENSE.txt).
 
 ## Issues
-Yes. _(Of course.)_ See Issues tab. Issue reporting is welcome. Pull requests are welcome. Also, check Wiki.
+Yes. _(Of course.)_ See Issues tab. Issue reporting is welcome. Pull requests are welcome. (But read [Wiki](https://github.com/Inchoo/Inchoo_PHP7/wiki) and existing code first.)
 
 ## Installation
 For Composer install, available on Firegento: http://packages.firegento.com/ . Because of strict Composer versioning rules, only the CE version will show up there versioned. Use dev-EE for Enterprise version. (At least for now.)
 
 Or just download ZIP of the latest release and copy files to appropriate locations.
+
+Remember to clear the cache. Also, check [Proper Installation](https://github.com/Inchoo/Inchoo_PHP7/wiki/ProperInstallation) Wiki page.
diff --git a/app/code/local/Inchoo/PHP7/Helper/Data.php b/app/code/local/Inchoo/PHP7/Helper/Data.php
@@ -1,16 +1,19 @@
 <?php
 
-class Inchoo_PHP7_Helper_Data extends Mage_Core_Helper_Data {
+class Inchoo_PHP7_Helper_Data extends Mage_Core_Helper_Data
+{
+    /** @var string $_moduleName Compatibility for translations, and maybe other stuff which uses module names. */
+    protected $_moduleName = 'Mage_Core';
 
     /**
-     * Decodes the given $encodedValue string which is
-     * encoded in the JSON format
+     * Decodes the given $encodedValue string which is encoded in the JSON format
      *
      * Overridden to prevent exceptions in json_decode
      *
      * @param string $encodedValue
-     *
+     * @param int $objectDecodeType
      * @return mixed
+     * @throws Zend_Json_Exception
      */
     public function jsonDecode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY) {
         switch (true) {
@@ -23,5 +26,4 @@ public function jsonDecode($encodedValue, $objectDecodeType = Zend_Json::TYPE_AR
 
         return Zend_Json::decode($encodedValue, $objectDecodeType);
     }
-
 }
diff --git a/app/code/local/Inchoo/PHP7/etc/config.xml b/app/code/local/Inchoo/PHP7/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Inchoo_PHP7>
-            <version>1.0.5</version>
+            <version>1.0.6</version>
         </Inchoo_PHP7>
     </modules>
 

diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,12 @@
+# Change Log
+
+## [1.0.6] - 2016-09-08
+### Added
+- changelog.md, because we really should have this, so I guess it's better to start late than never...
+- protected $_moduleName = 'Mage_Core'; in helper overwrite (should fix translation problems).
+
+### Changed
+- README.md updated with slightly more information.
+
+## [1.0.5] - 2016-08-19
+_Last version without a changelog._