Merge pull request #2 from martin-georgiev/feature/better-support-of-…

…text-arrays

Better support of PostgreSQL text array type

.travis.yml

@@ -6,4 +6,6 @@ php:
   - '7.1'
   - hhvm
   - nightly
-install: composer install
+install: composer install
+script:
+  - vendor/bin/phpunit

src/MartinGeorgiev/Doctrine/DBAL/Types/AbstractTypeArray.php

@@ -7,7 +7,7 @@
 
 /**
  * Abstract handling of PostgreSql array data types
- * @see http://www.postgresql.org/docs/9.4/static/arrays.html
+ * @see https://www.postgresql.org/docs/9.4/static/arrays.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/DBAL/Types/BigIntArray.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql BIGINT[] data type
- * @see http://www.postgresql.org/docs/9.4/static/arrays.html
+ * @see https://www.postgresql.org/docs/9.4/static/arrays.html
  * 
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/DBAL/Types/IntegerArray.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql INTEGER[] data type
- * @see http://www.postgresql.org/docs/9.4/static/arrays.html
+ * @see https://www.postgresql.org/docs/9.4/static/arrays.html
  * 
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/DBAL/Types/Jsonb.php

@@ -7,7 +7,7 @@
 
 /**
  * Implementation of PostgreSql JSONB data type
- * @see http://www.postgresql.org/docs/9.4/static/datatype-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/datatype-json.html
  * 
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/DBAL/Types/JsonbArray.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB[] data type
- * @see http://www.postgresql.org/docs/9.4/static/arrays.html
+ * @see https://www.postgresql.org/docs/9.4/static/arrays.html
  * 
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/DBAL/Types/SmallIntArray.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql SMALLINT[] data type
- * @see http://www.postgresql.org/docs/9.4/static/arrays.html
+ * @see https://www.postgresql.org/docs/9.4/static/arrays.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/DBAL/Types/TextArray.php

@@ -3,10 +3,11 @@
 namespace MartinGeorgiev\Doctrine\DBAL\Types;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use MartinGeorgiev\Utils\DataStructure;
 
 /**
  * Implementation of PostgreSql TEXT[] data type
- * @see http://www.postgresql.org/docs/9.4/static/arrays.html
+ * @see https://www.postgresql.org/docs/9.4/static/arrays.html
  *
  * @since 0.6
  * @author Martin Georgiev <[email protected]>
@@ -24,7 +25,7 @@ class TextArray extends AbstractType
      * @param mixed $value The value to convert.
      * @param AbstractPlatform $platform The currently used database platform.
      *
-     * @return string The database representation of the value.
+     * @return null|string The database representation of the value.
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
@@ -38,7 +39,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
     /**
      * @param array $phpTextArray
      * 
-     * @return string
+     * @return bool|string
      */
     protected function transformToPostgresTextArray($phpTextArray)
     {
@@ -48,7 +49,7 @@ protected function transformToPostgresTextArray($phpTextArray)
         if (empty($phpTextArray)) {
             return '{}';
         }
-        return '{"' . join('","', $phpTextArray) . '"}';
+        return DataStructure::transformPHPArrayToPostgresTextArray($phpTextArray);
     }
 
     /**
@@ -57,7 +58,7 @@ protected function transformToPostgresTextArray($phpTextArray)
      * @param string $value The value to convert.
      * @param AbstractPlatform $platform The currently used database platform.
      *
-     * @return array The PHP representation of the value.
+     * @return null|array The PHP representation of the value.
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
@@ -78,7 +79,7 @@ protected function transformFromPostgresTextArray($postgresValue)
         if ($postgresValue === '{}') {
             return [];
         }
-        $trimmedPostgresValue = mb_substr($postgresValue, 2, -2);
-        return explode('","', $trimmedPostgresValue);
+
+        return DataStructure::transformPostgresTextArrayToPHPArray($postgresValue);
     }
 }

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/All.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ALL()
- * @see http://www.postgresql.org/docs/9.4/static/functions-subquery.html#FUNCTIONS-SUBQUERY-ALL
+ * @see https://www.postgresql.org/docs/9.4/static/functions-subquery.html#FUNCTIONS-SUBQUERY-ALL
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Any.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ANY()
- * @see http://www.postgresql.org/docs/9.4/static/functions-subquery.html#FUNCTIONS-SUBQUERY-ANY-SOME
+ * @see https://www.postgresql.org/docs/9.4/static/functions-subquery.html#FUNCTIONS-SUBQUERY-ANY-SOME
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Arr.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ARRAY[]
- * @see http://www.postgresql.org/docs/9.4/static/arrays.html
+ * @see https://www.postgresql.org/docs/9.4/static/arrays.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAppend.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ARRAY_APPEND()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAreOverlapingEachOther.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql check if two arrays have elements in common (using &&)
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCardinality.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql CARDINALITY()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCat.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ARRAY_CAT()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayPrepend.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ARRAY_PREPEND()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayRemove.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ARRAY_REMOVE()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayReplace.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ARRAY_REPLACE()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayToString.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql ARRAY_TO_STRING()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Contains.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql check if left side contains right side (using @>)
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Greatest.php

@@ -8,7 +8,7 @@
 
 /**
  * Implementation of PostgreSql GREATEST()
- * @see http://www.postgresql.org/docs/9.4/static/functions-conditional.html#FUNCTIONS-GREATEST-LEAST
+ * @see https://www.postgresql.org/docs/9.4/static/functions-conditional.html#FUNCTIONS-GREATEST-LEAST
  *
  * @since 0.7
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/InArray.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql STRING_TO_ARRAY()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.4
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/IsContainedBy.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql check if left side is contained by right side (using <@)
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetField.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql json field retrival, filtered by key (using ->)
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetFieldAsInteger.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql json field retrival as integer, filtered by key (using ->> and type casting to BIGINT)
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.3
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetFieldAsText.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql json field retrival as text, filtered by key (using ->>)
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetObject.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql json object retrival, filtered by specific path (using #>)
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetObjectAsText.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql json object retrival as text, filtered by specific path (using #>>)
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbArrayElements.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB_ARRAY_ELEMENTS()
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbArrayElementsText.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB_ARRAY_ELEMENTS_TEXT()
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbArrayLength.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB_ARRAY_LENGTH()
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbEach.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB_EACH()
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbEachText.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB_EACH_TEXT()
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbExists.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB_EXISTS()
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbObjectKeys.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql JSONB_OBJECT_KEYS()
- * @see http://www.postgresql.org/docs/9.4/static/functions-json.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-json.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Least.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql LEAST()
- * @see http://www.postgresql.org/docs/9.4/static/functions-conditional.html#FUNCTIONS-GREATEST-LEAST
+ * @see https://www.postgresql.org/docs/9.4/static/functions-conditional.html#FUNCTIONS-GREATEST-LEAST
  *
  * @since 0.7
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StringToArray.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql STRING_TO_ARRAY()
- * @see http://www.postgresql.org/docs/9.4/static/functions-array.html
+ * @see https://www.postgresql.org/docs/9.4/static/functions-array.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ToTsquery.php

@@ -4,7 +4,7 @@
 
 /**
  * Implementation of PostgreSql TO_TSQUERY()
- * @see http://www.postgresql.org/docs/9.4/static/textsearch-controls.html
+ * @see https://www.postgresql.org/docs/9.4/static/textsearch-controls.html
  *
  * @since 0.1
  * @author Martin Georgiev <[email protected]>