new version

Author: rez1dent3

demo/download.php

@@ -2,8 +2,7 @@
 
 include_once __DIR__ . '/../vendor/autoload.php';
 
-$builder = new \Deimos\Builder\Builder();
-$helper  = new \Deimos\Helper\Helper($builder);
+$helper = new \Deimos\Helper\Helper();
 
 $name = $helper->str()->translit('MVC Example Администрирование локальных сетей.zip');
 

demo/send.php

@@ -2,8 +2,7 @@
 
 include_once __DIR__ . '/../vendor/autoload.php';
 
-$builder = new \Deimos\Builder\Builder();
-$helper  = new \Deimos\Helper\Helper($builder);
+$helper  = new \Deimos\Helper\Helper();
 
 $bytes         = 0;
 $bytesIterator = 0;

demo/test.php

@@ -2,8 +2,7 @@
 
 include_once __DIR__ . '/../vendor/autoload.php';
 
-$builder = new \Deimos\Builder\Builder();
-$helper  = new \Deimos\Helper\Helper($builder);
+$helper  = new \Deimos\Helper\Helper();
 
 var_dump($helper->arr()->get([
     'name' => 'Max'

demo/upload.php

@@ -13,7 +13,7 @@
 if ($_SERVER['REQUEST_METHOD'] === 'POST')
 {
 
-    $helper = new \Deimos\Helper\Helper(new \Deimos\Builder\Builder());
+    $helper = new \Deimos\Helper\Helper();
 
     $files = $helper->uploads()->get('file');
 

src/Helper/Helper.php

@@ -19,7 +19,7 @@ class Helper extends Builder
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(Builder $builder)
+    public function __construct(Builder $builder = null)
     {
         if ($builder instanceof self)
         {

src/Helper/Helpers/File.php

@@ -27,18 +27,6 @@ public function remove($path)
         return unlink($path);
     }
 
-    /**
-     * @param string $path
-     *
-     * @return bool
-     *
-     * @deprecated use File->isFile OR Dir->isDir, as it slowly
-     */
-    public function exists($path)
-    {
-        return file_exists($path);
-    }
-
     /**
      * @param string $path
      *

src/Helper/Helpers/Math.php

@@ -7,6 +7,10 @@
 class Math extends AbstractHelper
 {
 
+    const PI   = M_PI;
+    const PI_2 = M_PI_2;
+    const PI_4 = M_PI_4;
+
     /**
      * @param $base
      *
@@ -25,7 +29,7 @@ public function sqr($base)
      */
     public function pow($base, $exponent)
     {
-        return pow($base, $exponent);
+        return $base ** $exponent;
     }
 
     /**
@@ -62,4 +66,4 @@ public function isEven($argument)
         return !($argument & 1);
     }
 
-}
+}

src/Helper/Traits/Helper.php

@@ -23,7 +23,7 @@ trait Helper
      *
      * @throws \InvalidArgumentException
      */
-    protected final function helper()
+    protected function helper()
     {
         if (!$this->helper)
         {
@@ -38,7 +38,7 @@ protected final function helper()
      *
      * @throws \InvalidArgumentException
      */
-    private function instanceHelper()
+    protected function instanceHelper()
     {
         if (method_exists($this->builder, 'helper'))
         {

tests/Tests/ArrTest.php

@@ -141,7 +141,7 @@ public function testFindPath()
 
     public function testSet()
     {
-        $storage = ['a' => ['b' => 1]];
+        $storage = ['a' => ['b' => 1, 'd' => range(1, 10)]];
 
         $this->helper()->arr()->set($storage, 'a.b', 2);
         $this->helper()->arr()->set($storage, 'a.c', 1);
@@ -157,6 +157,11 @@ public function testSet()
             1
         );
 
+        $this->assertEquals(
+            $this->helper()->arr()->get($storage, 'a.d[0]'),
+            1
+        );
+
         $this->assertEquals(
             $this->helper()->arr()->get($storage, 'a.d.e.f.g.a.b'),
             1

tests/bootstrap.php

@@ -6,3 +6,18 @@
 $loader = require dirname(__DIR__) . '/vendor/autoload.php';
 
 $loader->addPsr4('DeimosTest\\', 'tests/src/');
+
+if (class_exists('\PHPUnit\Framework\TestCase'))
+{
+    class TestCase extends \PHPUnit\Framework\TestCase
+    {
+
+    }
+}
+else
+{
+    class TestCase extends \PHPUnit_Framework_TestCase
+    {
+
+    }
+}