PHP 7 support fix

Since from PHP7+, "Iterable" becomes a reserved word we need to replace by something else.
lonphy · Oct 14, 2017 · 49730dc · 49730dc
1 parent 1bc60a0
commit 49730dc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/combatObject/FireManager.php b/combatObject/FireManager.php
@@ -26,7 +26,7 @@
  * @version 21-03-2015
  * @link https://github.com/jstar88/opbe
  */
-class FireManager extends Iterable
+class FireManager extends IterableUtil
 {
     protected $array = array();
     public function add(Fire $fire)

diff --git a/models/Fleet.php b/models/Fleet.php
@@ -26,7 +26,7 @@
  * @version 23-3-2015)
  * @link https://github.com/jstar88/opbe
  */
-class Fleet extends Iterable
+class Fleet extends IterableUtil
 {
     protected $array = array();
     private $count;

diff --git a/models/Player.php b/models/Player.php
@@ -26,7 +26,7 @@
  * @version beta(26-10-2013)
  * @link https://github.com/jstar88/opbe
  */
-class Player extends Iterable
+class Player extends IterableUtil
 {
     private $id;
     protected $array = array();

diff --git a/models/PlayerGroup.php b/models/PlayerGroup.php
@@ -26,7 +26,7 @@
  * @version beta(26-10-2013)
  * @link https://github.com/jstar88/opbe
  */
-class PlayerGroup extends Iterable
+class PlayerGroup extends IterableUtil
 {
 
     protected $array = array();

diff --git a/utils/Iterable.php → utils/IterableUtil.php b/utils/Iterable.php → utils/IterableUtil.php
@@ -26,7 +26,7 @@
  * @version alpha(2013-2-4)
  * @link https://github.com/jstar88/opbe
  */
-class Iterable implements Iterator
+class IterableUtil implements Iterator
 {
 
     /* Iterator functions */

diff --git a/utils/includer.php b/utils/includer.php
@@ -31,7 +31,7 @@
 require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'GeometricDistribution.php');
 require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'Gauss.php');
 require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'DebugManager.php'); 
-require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'Iterable.php');
+require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'IterableUtil.php');
 require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'Math.php');
 require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'Number.php');
 require (OPBEPATH.'utils'.DIRECTORY_SEPARATOR.'Events.php');