From 27311daeac39ec247ddfd86614f3a73cb6080eec Mon Sep 17 00:00:00 2001
From: Andrey Kutejko <andy128k@gmail.com>
Date: Tue, 17 Dec 2013 21:24:11 +0200
Subject: [PATCH] introduce namespace PFF. version 0.2

---
 composer.json                               |  2 +-
 src/{arraytools.php => array.php}           | 13 ++++++-
 src/{collectiontools.php => collection.php} |  4 ++-
 src/dateformat.php                          |  4 +++
 src/htmlbuilder.php                         |  2 +-
 src/mixins.php                              |  2 ++
 src/regexp.php                              |  2 ++
 src/{stringtools.php => str.php}            |  4 ++-
 t/{ArrayTest.php => ArrTest.php}            | 29 +++++++++------
 t/CollectionTest.php                        |  8 ++---
 t/FormatTest.php                            | 40 ++++++++++-----------
 t/HtmlBuilderTest.php                       |  4 +--
 t/MixinsTest.php                            |  6 ++--
 t/StrTest.php                               | 25 +++++++++++++
 t/StringTest.php                            | 25 -------------
 15 files changed, 100 insertions(+), 70 deletions(-)
 rename src/{arraytools.php => array.php} (77%)
 rename src/{collectiontools.php => collection.php} (97%)
 rename src/{stringtools.php => str.php} (90%)
 rename t/{ArrayTest.php => ArrTest.php} (55%)
 create mode 100644 t/StrTest.php
 delete mode 100644 t/StringTest.php

diff --git a/composer.json b/composer.json
index 73108ec..b921b83 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
   ],
   "extra": {
     "branch-alias": {
-      "dev-master": "0.1-dev"
+      "dev-master": "0.2-dev"
     }
   }
 }
diff --git a/src/arraytools.php b/src/array.php
similarity index 77%
rename from src/arraytools.php
rename to src/array.php
index 3550f3c..e11671c 100644
--- a/src/arraytools.php
+++ b/src/array.php
@@ -1,6 +1,8 @@
 <?php
 
-final class ArrayTools
+namespace PFF;
+
+final class Arr
 {
     public static function get($array, $key, $default=null)
     {
@@ -34,5 +36,14 @@ final class ArrayTools
             return $default;
         }
     }
+
+    public static function flatten($array)
+    {
+        $result = array();
+        array_walk_recursive($array, function ($value) use (&$result) {
+            $result[] = $value;
+        });
+        return $result;
+    }
 }
 
diff --git a/src/collectiontools.php b/src/collection.php
similarity index 97%
rename from src/collectiontools.php
rename to src/collection.php
index fd62b2a..9c51f9b 100644
--- a/src/collectiontools.php
+++ b/src/collection.php
@@ -1,6 +1,8 @@
 <?php
 
-final class Collections
+namespace PFF;
+
+final class Collection
 {
     /*
      * Example output:
diff --git a/src/dateformat.php b/src/dateformat.php
index 3032fbf..8bb76a2 100644
--- a/src/dateformat.php
+++ b/src/dateformat.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace PFF;
+
+use \Pegp as Pegp;
+
 final class DateFormat
 {
     const DATE_BIG_ENDIAN     =  0;
diff --git a/src/htmlbuilder.php b/src/htmlbuilder.php
index 6b4aa4f..d0dee24 100644
--- a/src/htmlbuilder.php
+++ b/src/htmlbuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HtmlBuilder;
+namespace PFF\HtmlBuilder;
 
 class Tag
 {
diff --git a/src/mixins.php b/src/mixins.php
index 78897b8..b0b8f03 100644
--- a/src/mixins.php
+++ b/src/mixins.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace PFF;
+
 class Mixins
 {
     private $methods = array();
diff --git a/src/regexp.php b/src/regexp.php
index 7ccb64a..57411a3 100644
--- a/src/regexp.php
+++ b/src/regexp.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace PFF;
+
 class Regexp
 {
     public static function email()
diff --git a/src/stringtools.php b/src/str.php
similarity index 90%
rename from src/stringtools.php
rename to src/str.php
index 871afee..3178584 100644
--- a/src/stringtools.php
+++ b/src/str.php
@@ -1,6 +1,8 @@
 <?php
 
-final class StringTools
+namespace PFF;
+
+final class Str
 {
     public static function startsWith($haystack, $needle)
     {
diff --git a/t/ArrayTest.php b/t/ArrTest.php
similarity index 55%
rename from t/ArrayTest.php
rename to t/ArrTest.php
index de15380..e0def0c 100644
--- a/t/ArrayTest.php
+++ b/t/ArrTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ArrayToolsTest extends PHPUnit_Framework_TestCase
+class ArrTest extends PHPUnit_Framework_TestCase
 {
     public function testGet()
     {
@@ -10,9 +10,9 @@ class ArrayToolsTest extends PHPUnit_Framework_TestCase
             'carrot' => 50,
         );
 
-        $this->assertEquals(400, ArrayTools::get($arr, 'grapefruit'));
-        $this->assertEquals(null, ArrayTools::get($arr, 'orange'));
-        $this->assertEquals('no-oranges', ArrayTools::get($arr, 'orange', 'no-oranges'));
+        $this->assertEquals(400, \PFF\Arr::get($arr, 'grapefruit'));
+        $this->assertEquals(null, \PFF\Arr::get($arr, 'orange'));
+        $this->assertEquals('no-oranges', \PFF\Arr::get($arr, 'orange', 'no-oranges'));
     }
 
     public function testEnsureKeyExists()
@@ -24,7 +24,7 @@ class ArrayToolsTest extends PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(false, array_key_exists('orange', $arr));
-        ArrayTools::ensureKeyExists($arr, 'orange');
+        \PFF\Arr::ensureKeyExists($arr, 'orange');
         $this->assertEquals(true, array_key_exists('orange', $arr));
     }
 
@@ -32,9 +32,9 @@ class ArrayToolsTest extends PHPUnit_Framework_TestCase
     {
         $arr = array('carrot' => array('orange'));
 
-        ArrayTools::pushToKey($arr, 'apple', 'green');
-        ArrayTools::pushToKey($arr, 'carrot', 'long');
-        ArrayTools::pushToKey($arr, 'apple', 'sweet');
+        \PFF\Arr::pushToKey($arr, 'apple', 'green');
+        \PFF\Arr::pushToKey($arr, 'carrot', 'long');
+        \PFF\Arr::pushToKey($arr, 'apple', 'sweet');
 
         $this->assertEquals(array('green', 'sweet'), $arr['apple']);
         $this->assertEquals(array('orange', 'long'), $arr['carrot']);
@@ -48,15 +48,22 @@ class ArrayToolsTest extends PHPUnit_Framework_TestCase
             'carrot' => 50,
         );
 
-        $apple = ArrayTools::pop($arr, 'apple');
+        $apple = \PFF\Arr::pop($arr, 'apple');
         $this->assertEquals(false, array_key_exists('apple', $arr));
         $this->assertEquals(100, $apple);
 
-        $apple = ArrayTools::pop($arr, 'apple');
+        $apple = \PFF\Arr::pop($arr, 'apple');
         $this->assertEquals(null, $apple);
 
-        $apple = ArrayTools::pop($arr, 'apple', 'what?');
+        $apple = \PFF\Arr::pop($arr, 'apple', 'what?');
         $this->assertEquals('what?', $apple);
     }
+
+    public function testFlatten()
+    {
+        $arr = array('a', 'b', array(array(array('x'), 'y', 'z')), array(array('p')));
+        $flat = \PFF\Arr::flatten($arr);
+        $this->assertEquals(array('a', 'b', 'x', 'y', 'z', 'p'), $flat);
+    }
 }
 
diff --git a/t/CollectionTest.php b/t/CollectionTest.php
index dcf952f..4005b03 100644
--- a/t/CollectionTest.php
+++ b/t/CollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class CollectionsTest extends PHPUnit_Framework_TestCase
+class CollectionTest extends PHPUnit_Framework_TestCase
 {
     public function testColumns()
     {
@@ -10,7 +10,7 @@ class CollectionsTest extends PHPUnit_Framework_TestCase
             'carrot',
             'tomato',
         );
-        $columns = Collections::columns($arr, 3);
+        $columns = \PFF\Collection::columns($arr, 3);
         $this->assertEquals(3, count($columns));
         $this->assertEquals(2, count($columns[0]));
         $this->assertEquals(1, count($columns[1]));
@@ -25,7 +25,7 @@ class CollectionsTest extends PHPUnit_Framework_TestCase
             'carrot',
             'tomato',
         );
-        $chunks = Collections::chunks($arr, 3);
+        $chunks = \PFF\Collection::chunks($arr, 3);
         $this->assertEquals(2, count($chunks));
         $this->assertEquals(3, count($chunks[0]));
         $this->assertEquals(1, count($chunks[1]));
@@ -39,7 +39,7 @@ class CollectionsTest extends PHPUnit_Framework_TestCase
             'carrot',
             'tomato',
         );
-        $chunks = Collections::chunks($arr, 3, true);
+        $chunks = \PFF\Collection::chunks($arr, 3, true);
         $this->assertEquals(2, count($chunks));
         $this->assertEquals(3, count($chunks[0]));
         $this->assertEquals(3, count($chunks[1]));
diff --git a/t/FormatTest.php b/t/FormatTest.php
index 2f6245f..a600516 100644
--- a/t/FormatTest.php
+++ b/t/FormatTest.php
@@ -1,36 +1,36 @@
 <?php
 
-class Format_Test extends PHPUnit_Framework_TestCase
+class FormatTest extends PHPUnit_Framework_TestCase
 {
     public function testFlags()
     {
-        $this->assertEquals(DateFormat::DATE_DEFAULT,  DateFormat::DATE_BIG_ENDIAN    | DateFormat::DATE_HYPHENS);
-        $this->assertEquals(DateFormat::DATE_US,       DateFormat::DATE_MIDDLE_ENDIAN | DateFormat::DATE_SLASHES);
-        $this->assertEquals(DateFormat::DATE_EUROPEAN, DateFormat::DATE_LITTLE_ENDIAN | DateFormat::DATE_DOTS);
+        $this->assertEquals(\PFF\DateFormat::DATE_DEFAULT,  \PFF\DateFormat::DATE_BIG_ENDIAN    | \PFF\DateFormat::DATE_HYPHENS);
+        $this->assertEquals(\PFF\DateFormat::DATE_US,       \PFF\DateFormat::DATE_MIDDLE_ENDIAN | \PFF\DateFormat::DATE_SLASHES);
+        $this->assertEquals(\PFF\DateFormat::DATE_EUROPEAN, \PFF\DateFormat::DATE_LITTLE_ENDIAN | \PFF\DateFormat::DATE_DOTS);
     }
 
     public function testDateFlagsFromString()
     {
-        $this->assertEquals(DateFormat::DATE_DEFAULT,  DateFormat::dateFlagsFromString('Default'));
-        $this->assertEquals(DateFormat::DATE_DEFAULT,  DateFormat::dateFlagsFromString('Big-endian hyphEns'));
-        $this->assertEquals(DateFormat::DATE_EUROPEAN, DateFormat::dateFlagsFromString('European'));
-        $this->assertEquals(DateFormat::DATE_EUROPEAN, DateFormat::dateFlagsFromString('little-endian dots'));
-        $this->assertEquals(DateFormat::DATE_US,       DateFormat::dateFlagsFromString('US'));
-        $this->assertEquals(DateFormat::DATE_US,       DateFormat::dateFlagsFromString('Middle-Endian Slashes'));
-        $this->assertEquals(DateFormat::DATE_BIG_ENDIAN | DateFormat::DATE_SPACES,
-                                                       DateFormat::dateFlagsFromString('big-endian spaces'));
+        $this->assertEquals(\PFF\DateFormat::DATE_DEFAULT,  \PFF\DateFormat::dateFlagsFromString('Default'));
+        $this->assertEquals(\PFF\DateFormat::DATE_DEFAULT,  \PFF\DateFormat::dateFlagsFromString('Big-endian hyphEns'));
+        $this->assertEquals(\PFF\DateFormat::DATE_EUROPEAN, \PFF\DateFormat::dateFlagsFromString('European'));
+        $this->assertEquals(\PFF\DateFormat::DATE_EUROPEAN, \PFF\DateFormat::dateFlagsFromString('little-endian dots'));
+        $this->assertEquals(\PFF\DateFormat::DATE_US,       \PFF\DateFormat::dateFlagsFromString('US'));
+        $this->assertEquals(\PFF\DateFormat::DATE_US,       \PFF\DateFormat::dateFlagsFromString('Middle-Endian Slashes'));
+        $this->assertEquals(\PFF\DateFormat::DATE_BIG_ENDIAN | \PFF\DateFormat::DATE_SPACES,
+                                                               \PFF\DateFormat::dateFlagsFromString('big-endian spaces'));
     }
 
     public function testDatetimeFlagsFromString()
     {
-        $this->assertEquals(DateFormat::DATETIME_DEFAULT,  DateFormat::datetimeFlagsFromString('Default'));
-        $this->assertEquals(DateFormat::DATETIME_DEFAULT,  DateFormat::datetimeFlagsFromString('Big-endian hyphEns 24'));
-        $this->assertEquals(DateFormat::DATETIME_EUROPEAN, DateFormat::datetimeFlagsFromString('European'));
-        $this->assertEquals(DateFormat::DATETIME_EUROPEAN, DateFormat::datetimeFlagsFromString('little-endian dots 24'));
-        $this->assertEquals(DateFormat::DATETIME_US,       DateFormat::datetimeFlagsFromString('US'));
-        $this->assertEquals(DateFormat::DATETIME_US,       DateFormat::datetimeFlagsFromString('Middle-Endian Slashes 12-upper'));
-        $this->assertEquals(DateFormat::DATE_BIG_ENDIAN | DateFormat::DATE_SPACES | DateFormat::TIME_12HOURS_LOWER | DateFormat::TIME_SECONDS,
-                                                           DateFormat::datetimeFlagsFromString("big-endian spaces \n 12-lower Seconds"));
+        $this->assertEquals(\PFF\DateFormat::DATETIME_DEFAULT,  \PFF\DateFormat::datetimeFlagsFromString('Default'));
+        $this->assertEquals(\PFF\DateFormat::DATETIME_DEFAULT,  \PFF\DateFormat::datetimeFlagsFromString('Big-endian hyphEns 24'));
+        $this->assertEquals(\PFF\DateFormat::DATETIME_EUROPEAN, \PFF\DateFormat::datetimeFlagsFromString('European'));
+        $this->assertEquals(\PFF\DateFormat::DATETIME_EUROPEAN, \PFF\DateFormat::datetimeFlagsFromString('little-endian dots 24'));
+        $this->assertEquals(\PFF\DateFormat::DATETIME_US,       \PFF\DateFormat::datetimeFlagsFromString('US'));
+        $this->assertEquals(\PFF\DateFormat::DATETIME_US,       \PFF\DateFormat::datetimeFlagsFromString('Middle-Endian Slashes 12-upper'));
+        $this->assertEquals(\PFF\DateFormat::DATE_BIG_ENDIAN | \PFF\DateFormat::DATE_SPACES | \PFF\DateFormat::TIME_12HOURS_LOWER | \PFF\DateFormat::TIME_SECONDS,
+                                                               \PFF\DateFormat::datetimeFlagsFromString("big-endian spaces \n 12-lower Seconds"));
     }
 }
 
diff --git a/t/HtmlBuilderTest.php b/t/HtmlBuilderTest.php
index 3892193..bdef45d 100644
--- a/t/HtmlBuilderTest.php
+++ b/t/HtmlBuilderTest.php
@@ -4,9 +4,9 @@ class HtmlBuilderTest extends PHPUnit_Framework_TestCase
 {
     public function testTag()
     {
-        $tag = HtmlBuilder\Tag::div(array('class' => 'container'))
+        $tag = \PFF\HtmlBuilder\Tag::div(array('class' => 'container'))
             ->append('Hello, "World"')
-            ->append(HtmlBuilder\Tag::a()->append('click ')->raw('<b>me</b>'));
+            ->append(\PFF\HtmlBuilder\Tag::a()->append('click ')->raw('<b>me</b>'));
 
         $this->assertEquals('<div class="container">Hello, &quot;World&quot;<a>click <b>me</b></a></div>', (string)$tag);
     }
diff --git a/t/MixinsTest.php b/t/MixinsTest.php
index d634305..fb0970c 100644
--- a/t/MixinsTest.php
+++ b/t/MixinsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class SomeMixin extends Mixin
+class SomeMixin extends \PFF\Mixin
 {
     public function getSmthUseful()
     {
@@ -13,7 +13,7 @@ class SomeMixin extends Mixin
     }
 }
 
-class WrapMixin extends Mixin
+class WrapMixin extends \PFF\Mixin
 {
     public function getSmthUseful()
     {
@@ -26,7 +26,7 @@ class WrapMixin extends Mixin
     }
 }
 
-class Mixture extends Mixable
+class Mixture extends \PFF\Mixable
 {
     protected function __mixins() { return array('SomeMixin', 'WrapMixin'); }
 
diff --git a/t/StrTest.php b/t/StrTest.php
new file mode 100644
index 0000000..adf76f2
--- /dev/null
+++ b/t/StrTest.php
@@ -0,0 +1,25 @@
+<?php
+
+class StrTest extends PHPUnit_Framework_TestCase
+{
+    public function testStartsWith()
+    {
+        $this->assertTrue(\PFF\Str::startsWith('abcdef', 'abc'));
+        $this->assertFalse(\PFF\Str::startsWith(' abcdef', 'abc'));
+        $this->assertFalse(\PFF\Str::startsWith('abc', 'abcdef'));
+        $this->assertTrue(\PFF\Str::startsWith('abc', 'abc'));
+        $this->assertTrue(\PFF\Str::startsWith('abc', ''));
+        $this->assertFalse(\PFF\Str::startsWith('abc', ' '));
+    }
+
+    public function testEndsWith()
+    {
+        $this->assertTrue(\PFF\Str::endsWith('abcdef', 'def'));
+        $this->assertFalse(\PFF\Str::endsWith('abcdef ', 'def'));
+        $this->assertFalse(\PFF\Str::endsWith('abc', 'abcdef'));
+        $this->assertTrue(\PFF\Str::endsWith('abc', 'abc'));
+        $this->assertTrue(\PFF\Str::endsWith('abc', ''));
+        $this->assertFalse(\PFF\Str::endsWith('abc', ' '));
+    }
+}
+
diff --git a/t/StringTest.php b/t/StringTest.php
deleted file mode 100644
index e2c5eaf..0000000
--- a/t/StringTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class StringToolsTest extends PHPUnit_Framework_TestCase
-{
-    public function testStartsWith()
-    {
-        $this->assertTrue(StringTools::startsWith('abcdef', 'abc'));
-        $this->assertFalse(StringTools::startsWith(' abcdef', 'abc'));
-        $this->assertFalse(StringTools::startsWith('abc', 'abcdef'));
-        $this->assertTrue(StringTools::startsWith('abc', 'abc'));
-        $this->assertTrue(StringTools::startsWith('abc', ''));
-        $this->assertFalse(StringTools::startsWith('abc', ' '));
-    }
-
-    public function testEndsWith()
-    {
-        $this->assertTrue(StringTools::endsWith('abcdef', 'def'));
-        $this->assertFalse(StringTools::endsWith('abcdef ', 'def'));
-        $this->assertFalse(StringTools::endsWith('abc', 'abcdef'));
-        $this->assertTrue(StringTools::endsWith('abc', 'abc'));
-        $this->assertTrue(StringTools::endsWith('abc', ''));
-        $this->assertFalse(StringTools::endsWith('abc', ' '));
-    }
-}
-
-- 
2.49.0