Continued:

- the word "Default" and "Array" is not possible to use alone in namespace like
<?php
namespace Some\Foo\Array;
?> <-- yes, discouraged. just to clearify end-of-php
- some math stuff "fixed".
- removed discouraged headers from all remaining scripts

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/tests/loader.php b/application/tests/loader.php
index f551ef47b7591c74e7b59193e56a1fa6505a87ab..7d6dceec926b2c790d8a6cc64b29a822d57f79e9 100644 (file)
--- a/application/tests/loader.php
+++ b/application/tests/loader.php
@@ -1,3 +1,2 @@
 <?php
 // @DEPRECATED
-?>

diff --git a/contrib/benchmarks/array_serialization.php b/contrib/benchmarks/array_serialization.php
index 5f47766741438265ca2c6cf72b0ac9be46c9d14a..588af616633a4706c1d87fa78616a7d8ade1d4d3 100644 (file)
--- a/contrib/benchmarks/array_serialization.php
+++ b/contrib/benchmarks/array_serialization.php
@@ -33,5 +33,3 @@ for ($idx = 0; $idx < $iter; $idx++) {
 $diff2 = microtime(TRUE) - $time;
 
 print 'diff1=' . $diff1 . ',diff2=' . $diff2 . PHP_EOL;
-
-?>

diff --git a/contrib/exp/exp1.php b/contrib/exp/exp1.php
index 6ffd1a0023cc07bad3f98a3333b50e919f65f01e..c750e12c5d36d7852e1c104ed972fa9069936c3c 100644 (file)
--- a/contrib/exp/exp1.php
+++ b/contrib/exp/exp1.php
@@ -16,5 +16,3 @@ for ($i = 1; $i <= $totalDays; $i++) {
 
 print 'After ' . $totalDays . ' days (' . $years . ' years) you have eaten ' . $y . ' fruits.' . PHP_EOL;
 print 'Length:' . strlen($y) . PHP_EOL;
-
-?>

diff --git a/contrib/exp/exp2.php b/contrib/exp/exp2.php
index b6040fc543f68f9407f21e13844cac84ae30bb27..d83a33c6bc12dc9ac0317e03c323ceb7339d54f9 100644 (file)
--- a/contrib/exp/exp2.php
+++ b/contrib/exp/exp2.php
@@ -4,8 +4,8 @@ error_reporting(E_ALL | E_STRICT);
 bcscale(20);
 
 $balance = 1;
-$years = 100;
-$rate = 0.02;
+$years = 2017;
+$rate = 0.03;
 
 $totalMonths = $years * 12;
 
@@ -13,7 +13,7 @@ print 'Invest ' . $balance . ' EUR and come back later.' . PHP_EOL;
 
 for ($i = 1; $i <= $totalMonths; $i++) {
        // Reduce interest rate every month
-       $rate = bcdiv($rate, 1.001);
+       $rate = bcdiv($rate, 1.00001);
 
        // Calculate interest
        $interest = bcmul($balance, $rate);
@@ -26,5 +26,3 @@ for ($i = 1; $i <= $totalMonths; $i++) {
 
 print 'After ' . $totalMonths . ' months (' . $years . ' years) you have ' . $balance . ' EUR back.' . PHP_EOL;
 //print 'Length:' . strlen($balance) . PHP_EOL;
-
-?>

diff --git a/contrib/fib/fib.php b/contrib/fib/fib.php
index 554557fad60a1f6f67d941b1ce331806d5ca3a3f..c0232b99a6865edd74085d29bf2608dab46a201f 100644 (file)
--- a/contrib/fib/fib.php
+++ b/contrib/fib/fib.php
@@ -16,5 +16,3 @@ for ($idx = 0; $idx < 100000; $idx++) {
        $prev = $fib;
        $fib  = $sum;
 }
-
-?>

diff --git a/framework/bootstrap/class_FrameworkBootstrap.php b/framework/bootstrap/class_FrameworkBootstrap.php
index 6f53a01501e2f74867e64e6d7b05b7464b8ebf0a..7ee612bd067b7585eb0e3a107253bbccd320cf45 100644 (file)
--- a/framework/bootstrap/class_FrameworkBootstrap.php
+++ b/framework/bootstrap/class_FrameworkBootstrap.php
@@ -57,7 +57,7 @@ final class FrameworkBootstrap {
         *
         * --foo=bar - parameter 'foo' gets value "bar" (string)
         * --enable-foo=true - parameter 'enableFoo' gets value true (boolean)
-        * --baz=123 - parameter 'baz' get value 123 (interger)
+        * --baz=123 - parameter 'baz' get value 123 (integer)
         *
         * The same also works without 2 dashes as it was possible before:
         *

diff --git a/framework/classes.php b/framework/classes.php
index f551ef47b7591c74e7b59193e56a1fa6505a87ab..7d6dceec926b2c790d8a6cc64b29a822d57f79e9 100644 (file)
--- a/framework/classes.php
+++ b/framework/classes.php
@@ -1,3 +1,2 @@
 <?php
 // @DEPRECATED
-?>

diff --git a/framework/config/config-hubmaster.php b/framework/config/config-hubmaster.php
index f551ef47b7591c74e7b59193e56a1fa6505a87ab..7d6dceec926b2c790d8a6cc64b29a822d57f79e9 100644 (file)
--- a/framework/config/config-hubmaster.php
+++ b/framework/config/config-hubmaster.php
@@ -1,3 +1,2 @@
 <?php
 // @DEPRECATED
-?>

diff --git a/framework/main/classes/class_FrameworkArrayObject.php b/framework/main/classes/class_FrameworkArrayObject.php
index a6fa8bea9e22e0c1a1bf5ab45333349be608f046..63e8f571ee106318e188c4c7e5070c9a4569257a 100644 (file)
--- a/framework/main/classes/class_FrameworkArrayObject.php
+++ b/framework/main/classes/class_FrameworkArrayObject.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Array;
+namespace CoreFramework\ObjectArray;
 
 // Import SPL stuff
 use \ArrayObject;

diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultController.php b/framework/main/classes/controller/console/class_ConsoleDefaultController.php
index a8016859fd96dd1d7762b86c931e326aa578b724..54fbb211d5aa3bd8e9e76ecf3426cd2cb0ca78e5 100644 (file)
--- a/framework/main/classes/controller/console/class_ConsoleDefaultController.php
+++ b/framework/main/classes/controller/console/class_ConsoleDefaultController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Controller\Default;
+namespace CoreFramework\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;

diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
index c754d58bcd7fc5420f0f72b0d4ae25afec2db977..92e611dec00d2291f178b540ccbcbe49d9f139b0 100644 (file)
--- a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
+++ b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Controller\Default;
+namespace CoreFramework\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;

diff --git a/framework/main/classes/controller/html/class_HtmlDefaultController.php b/framework/main/classes/controller/html/class_HtmlDefaultController.php
index 9ca28320da30cf410d12df65e710c2c9a91ac220..d7bd455bb3810cc76d7eb1fd497f8d2988cbe804 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlDefaultController.php
+++ b/framework/main/classes/controller/html/class_HtmlDefaultController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Controller\Default;
+namespace CoreFramework\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;

diff --git a/framework/main/classes/controller/image/class_ImageDefaultController.php b/framework/main/classes/controller/image/class_ImageDefaultController.php
index eaa9e845a6ba33ad97f0ff51dbde8471f22079c3..98be11da5d8202c9602042643926e0b4a2683f34 100644 (file)
--- a/framework/main/classes/controller/image/class_ImageDefaultController.php
+++ b/framework/main/classes/controller/image/class_ImageDefaultController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Controller\Default;
+namespace CoreFramework\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;

diff --git a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php
index b42b15158002cd69972c8da9df8953c9e514d553..794b6fccb41b30e7049f1ffb477208da767076e1 100644 (file)
--- a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php
+++ b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php
@@ -8,7 +8,7 @@ use CoreFramework\Registry\Registerable;
 /**
  * A class for binding to the FUSE wrapper. This class requires the PHP
  * extension fuse.dll/so being added to your setup. If you want to use this
- * class, please activate and use the FUSE feature instead of this class
+ * class, please activate and use the FUSE feature instead of using this class
  * directly. This gives you all required pre-tests. Please read there for
  * more detailed informations.
  *
@@ -31,7 +31,7 @@ use CoreFramework\Registry\Registerable;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-public class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
+class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
        /**
         * Get attributes
         *

diff --git a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
index 90a7cc813acc3ae482389848fc2766def994bb3c..8c8bde0d61eb8ce606bc7c0a52a8310d1892d1c6 100644 (file)
--- a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
+++ b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Array;
+namespace CoreFramework\ObjectArray;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkException;

diff --git a/framework/main/exceptions/main/class_MissingArrayElementsException.php b/framework/main/exceptions/main/class_MissingArrayElementsException.php
index 401d74b118dbe68ede0ab4f4d98dbd1c5f8b2b77..ab0ab776cb2d7be2818af538259e84ccbe50f385 100644 (file)
--- a/framework/main/exceptions/main/class_MissingArrayElementsException.php
+++ b/framework/main/exceptions/main/class_MissingArrayElementsException.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Array;
+namespace CoreFramework\ObjectArray;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkException;

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 127c7a29b8f52c2d3835d8f903091e1f24858990..2896d393c55dc481ef5088d090d36a5657b5e4d0 100644 (file)
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -149,5 +149,3 @@ class ConfigTest extends PHPUnit_Framework_TestCase {
                }
        }
 }
-
-?>

diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php
index 89b18a3f815c48ce5fb3116caa1769dab6207ed6..4807b416ae7b13417939e241e3aee40e3abd2266 100644 (file)
--- a/tests/RegistryTest.php
+++ b/tests/RegistryTest.php
@@ -90,5 +90,3 @@ class RegistryTest extends PHPUnit_Framework_TestCase {
                }
        }
 }
-
-?>

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index 81a9da8a69a64a76e9eb01510876ec1ea92c8d01..784239f14529b0f5174dd4d3af2321ae60237fe6 100644 (file)
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -98,5 +98,3 @@ class RequestTest extends PHPUnit_Framework_TestCase {
                }
        }
 }
-
-?>

diff --git a/tests/Test.php b/tests/Test.php
index 6783f7f709462eb5c47e2211021bbe5787d7caef..f9f1952f21846f7230389e9d58706299ed137ae2 100644 (file)
--- a/tests/Test.php
+++ b/tests/Test.php
@@ -50,5 +50,3 @@ die("You need to remove this line (".__LINE__.") and implement this test!\n");
  */
 class Test extends PHPUnit_Framework_TestCase {
 }
-
-?>

diff --git a/tests/old/contract-test.php b/tests/old/contract-test.php
index 5ddac0471b69723e0b4f3ed4d5876e9b69d98d66..962719d60ab6abb3ac4b35f6385a83684a6c1ae6 100644 (file)
--- a/tests/old/contract-test.php
+++ b/tests/old/contract-test.php
@@ -347,6 +347,3 @@ $totalBeds = $contract->getShipInstance()->calcTotalBeds();
 DebugMiddleware::getInstance()->output(sprintf("Es stehen <strong>%d</strong> Betten zur Verf&uuml;gung.",
        $totalBeds
 ));
-
-//
-?>

diff --git a/tests/old/loader-test.php b/tests/old/loader-test.php
index ae0fc99c100c8772040875ca66a184fb5056792b..aea6638c089324d2550ebbd4f5aa0086bec622e0 100644 (file)
--- a/tests/old/loader-test.php
+++ b/tests/old/loader-test.php
@@ -55,6 +55,3 @@ if (defined('DEBUG_PERSONELL_OBJ')) {
 
 // Try to save the object (for testing purposes)
 $personell->saveObjectToDatabase();
-
-//
-?>

diff --git a/tests/old/personell-test.php b/tests/old/personell-test.php
index cd1f48cd461a8d47910355c4d9513e6366ce9cf6..ab78f525acf0feff8eafd5c7934af91818f6e812 100644 (file)
--- a/tests/old/personell-test.php
+++ b/tests/old/personell-test.php
@@ -55,6 +55,3 @@ if (defined('DEBUG_PERSONELL_OBJ')) {
 
 // Try to save the object (for testing purposes)
 $personell->saveObjectToDatabase();
-
-//
-?>