Skip to content
This repository was archived by the owner on Jun 10, 2019. It is now read-only.

Commit 717d090

Browse files
author
Ivan Čurdinjaković
committed
1.0.6
1 parent 879e098 commit 717d090

4 files changed

Lines changed: 30 additions & 9 deletions

File tree

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Inchoo_PHP7
22

3-
PHP 7 compatibility extension for Magento 1 by Inchoo. Article with some tests and stats: http://inchoo.net/magento/its-alive/ .
3+
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/).
44

55
## Compatibility
6-
Tested on M CE 1.9.2.2 - 1.9.2.4. Reported working on M EE 1.14.2.2.
6+
Tested on M CE 1.9.2.2 - 1.9.2.4 & M EE 1.14.2.2 - 1.14.2.4.
77

88
(CE version of extension is in master branch, and EE version is in EE branch.)
99

@@ -13,13 +13,20 @@ If you can, upgrade to freshest Magento core first. If you can't, this may be a
1313

1414
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.
1515

16+
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.
17+
18+
## 3rd party extensions
19+
May be incompatible with PHP 7. We can't do anything about that. But their authors can.
20+
1621
## License
1722
MIT. (See LICENSE.txt).
1823

1924
## Issues
20-
Yes. _(Of course.)_ See Issues tab. Issue reporting is welcome. Pull requests are welcome. Also, check Wiki.
25+
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.)
2126

2227
## Installation
2328
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.)
2429

2530
Or just download ZIP of the latest release and copy files to appropriate locations.
31+
32+
Remember to clear the cache. Also, check [Proper Installation](https://github.com/Inchoo/Inchoo_PHP7/wiki/ProperInstallation) Wiki page.
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<?php
22

3-
class Inchoo_PHP7_Helper_Data extends Mage_Core_Helper_Data {
3+
class Inchoo_PHP7_Helper_Data extends Mage_Core_Helper_Data
4+
{
5+
/** @var string $_moduleName Compatibility for translations, and maybe other stuff which uses module names. */
6+
protected $_moduleName = 'Mage_Core';
47

58
/**
6-
* Decodes the given $encodedValue string which is
7-
* encoded in the JSON format
9+
* Decodes the given $encodedValue string which is encoded in the JSON format
810
*
911
* Overridden to prevent exceptions in json_decode
1012
*
1113
* @param string $encodedValue
12-
*
14+
* @param int $objectDecodeType
1315
* @return mixed
16+
* @throws Zend_Json_Exception
1417
*/
1518
public function jsonDecode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY) {
1619
switch (true) {
@@ -23,5 +26,4 @@ public function jsonDecode($encodedValue, $objectDecodeType = Zend_Json::TYPE_AR
2326

2427
return Zend_Json::decode($encodedValue, $objectDecodeType);
2528
}
26-
2729
}

app/code/local/Inchoo/PHP7/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<config>
33
<modules>
44
<Inchoo_PHP7>
5-
<version>1.0.5</version>
5+
<version>1.0.6</version>
66
</Inchoo_PHP7>
77
</modules>
88

changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Change Log
2+
3+
## [1.0.6] - 2016-09-08
4+
### Added
5+
- changelog.md, because we really should have this, so I guess it's better to start late than never...
6+
- protected $_moduleName = 'Mage_Core'; in helper overwrite (should fix translation problems).
7+
8+
### Changed
9+
- README.md updated with slightly more information.
10+
11+
## [1.0.5] - 2016-08-19
12+
_Last version without a changelog._

0 commit comments

Comments
 (0)