fix tests (#10)

* fix tests
* add newline

Author: IndraGunawan

.gitignore

@@ -1,3 +1,3 @@
 vendor
 composer.lock
-bin
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,15 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+;
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder)
+;

.travis.yml

@@ -1,24 +1,33 @@
 language: php
 
-php:
-  - 5.5
+dist: xenial
+addons:
+  apt:
+    packages:
+    - build-essential
+    - cmake
+    - libpcre3-dev
+    - libgmp-dev
+    - libssl-dev
 
-branches:
-  only:
-    - master
+php:
+  - 7.1.19
 
 before_install:
-  # PPA for libuv-dev
-  - sudo apt-add-repository ppa:linuxjedi/ppa -y
-  - sudo apt-get update
-  - sudo apt-get install -y libuv-dev libssl-dev
-  - cd /tmp && git clone https://github.com/datastax/php-driver.git && cd php-driver && git submodule update --init
-  - cd ext && ./install.sh && cd "$TRAVIS_BUILD_DIR"
-  - echo "extension=cassandra.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  # Cassandra Dependencies
+  - wget http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies/libuv/v1.24.0/libuv1_1.24.0-1_amd64.deb && sudo dpkg -i libuv1_1.24.0-1_amd64.deb
+  - wget http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies/libuv/v1.24.0/libuv1-dev_1.24.0-1_amd64.deb && sudo dpkg -i libuv1-dev_1.24.0-1_amd64.deb
+  - wget http://downloads.datastax.com/cpp-driver/ubuntu/16.04/cassandra/v2.11.0/cassandra-cpp-driver_2.11.0-1_amd64.deb && sudo dpkg -i cassandra-cpp-driver_2.11.0-1_amd64.deb
+  - wget http://downloads.datastax.com/cpp-driver/ubuntu/16.04/cassandra/v2.11.0/cassandra-cpp-driver-dev_2.11.0-1_amd64.deb && sudo dpkg -i cassandra-cpp-driver-dev_2.11.0-1_amd64.deb
+  - pecl channel-update pecl.php.net && pecl install cassandra
+  # PHP-cs-fixer
+  - composer global require --dev 'friendsofphp/php-cs-fixer'
+  - export PATH="$PATH:$HOME/.config/composer/vendor/bin:$HOME/.composer/vendor/bin"
 
 install:
-  - composer install -n --dev
+  - composer install --prefer-dist -n -o
 
 script:
-  - bin/atoum
+  - php-cs-fixer fix --dry-run --diff --no-ansi
+  - vendor/bin/atoum
 

Cassandra/Configurator.php

@@ -21,7 +21,7 @@ public static function buildCluster(Connection $connection)
     {
         $config = $connection->getConfig();
 
-        $consistency = constant('\Cassandra::CONSISTENCY_'.strtoupper($config['default_consistency']));
+        $consistency = \constant('\Cassandra::CONSISTENCY_'.strtoupper($config['default_consistency']));
 
         $cluster = new Builder();
         $cluster
@@ -36,17 +36,17 @@ public static function buildCluster(Connection $connection)
             ->withCredentials($config['user'], $config['password'])
             ->withProtocolVersion($config['protocol_version']);
 
-        if (isset($config['ssl']) && $config['ssl'] === true) {
+        if (isset($config['ssl']) && true === $config['ssl']) {
             $ssl = new SSLOptionsBuilder();
             $sslOption = $ssl->withVerifyFlags(\Cassandra::VERIFY_NONE)->build();
             $cluster->withSSL($sslOption);
         }
 
-        if (array_key_exists('default_timeout', $config)) {
+        if (\array_key_exists('default_timeout', $config)) {
             $cluster->withDefaultTimeout($config['default_timeout']);
         }
 
-        if ($config['load_balancing'] == 'round-robin') {
+        if ('round-robin' == $config['load_balancing']) {
             $cluster->withRoundRobinLoadBalancingPolicy();
         } else {
             $dcOption = $config['dc_options'];

Cassandra/Connection.php

@@ -126,7 +126,7 @@ public function getKeyspace()
      */
     public function getSession()
     {
-        if (is_null($this->session)) {
+        if (null === $this->session) {
             $this->session = $this->cluster->connect($this->getKeyspace());
         }
 
@@ -256,7 +256,7 @@ public function schema()
      */
     protected function prepareResponse($response, CassandraEvent $event = null)
     {
-        if (is_null($event)) {
+        if (null === $event) {
             return $response;
         }
 
@@ -280,7 +280,7 @@ protected function prepareResponse($response, CassandraEvent $event = null)
      */
     protected function prepareEvent($command, array $args)
     {
-        if (is_null($this->getEventDispatcher())) {
+        if (null === $this->getEventDispatcher()) {
             return;
         }
 
@@ -306,14 +306,14 @@ protected function send($command, array $arguments)
         $event = $this->prepareEvent($command, $arguments);
 
         // The last arguments of call_user_func_array must not be null
-        if (end($arguments) === null) {
+        if (null === end($arguments)) {
             array_pop($arguments);
         }
 
         $retry = $this->getMaxRetry();
         while ($retry >= 0) {
             try {
-                $return = call_user_func_array([$this->getSession(), $command], $arguments);
+                $return = \call_user_func_array([$this->getSession(), $command], $arguments);
 
                 // No exception, we can return the result
                 $retry = -1;

Cassandra/ORM/EntityManager.php

@@ -90,9 +90,9 @@ public function getClassMetadata($className)
     /**
      * Gets the repository for an entity class.
      *
-     * @param string $entityName The name of the entity.
+     * @param string $entityName the name of the entity
      *
-     * @return \CassandraBundle\Cassandra\ORM\EntityRepository The repository class.
+     * @return \CassandraBundle\Cassandra\ORM\EntityRepository the repository class
      */
     public function getRepository($entityName)
     {
@@ -102,12 +102,12 @@ public function getRepository($entityName)
     /**
      * Insert $entity to cassandra.
      *
-     * @param object $entity
+     * @param object  $entity
      * @param Options $options |null
      */
     public function insert($entity, Options $options = null)
     {
-        $metadata = $this->getClassMetadata(get_class($entity));
+        $metadata = $this->getClassMetadata(\get_class($entity));
         $tableName = $metadata->table['name'];
         $values = $this->readColumn($entity, $metadata);
         $columns = array_keys($values);
@@ -130,10 +130,12 @@ public function insert($entity, Options $options = null)
     }
 
     /**
-     * add options to statement
+     * add options to statement.
+     *
      * @param $statement
      * @param ClassMetadata $metadata
-     * @param Options|null $options
+     * @param Options|null  $options
+     *
      * @return string
      */
     private function decorateInsertStatement($statement, ClassMetadata $metadata, Options $options = null)
@@ -144,17 +146,18 @@ private function decorateInsertStatement($statement, ClassMetadata $metadata, Op
             $statement .= ' IF NOT EXISTS ';
         }
         if (!empty($options) && !empty($options->getTtl())) {
-            $statement .= ' USING TTL ' . $options->getTtl();
+            $statement .= ' USING TTL '.$options->getTtl();
         } elseif (!empty($metadata->table['defaultTtl'])) {
-            $statement .= ' USING TTL ' . $metadata->table['defaultTtl'];
+            $statement .= ' USING TTL '.$metadata->table['defaultTtl'];
         }
+
         return $statement;
     }
 
     /**
      * Update $entity to cassandra.
      *
-     * @param object $entity
+     * @param object       $entity
      * @param Options|null $options
      *
      * @deprecated update method will be deprecated since version 1.3 and will be removed in 1.5
@@ -171,7 +174,7 @@ public function update($entity, Options $options = null)
      */
     public function delete($entity)
     {
-        $metadata = $this->getClassMetadata(get_class($entity));
+        $metadata = $this->getClassMetadata(\get_class($entity));
         $tableName = $metadata->table['name'];
 
         $statement = sprintf(
@@ -191,12 +194,12 @@ public function delete($entity)
      */
     public function flush($async = true)
     {
-        if (count($this->statements)) {
+        if (\count($this->statements)) {
             $this->logger->debug('CASSANDRA: BEGIN');
             $batch = new BatchStatement(\Cassandra::BATCH_LOGGED);
 
             foreach ($this->statements as $statement) {
-                $this->logger->debug('CASSANDRA: ' . $statement[self::STATEMENT] . ' => ' . json_encode($statement[self::ARGUMENTS]));
+                $this->logger->debug('CASSANDRA: '.$statement[self::STATEMENT].' => '.json_encode($statement[self::ARGUMENTS]));
                 $batch->add($this->prepare($statement[self::STATEMENT]), $statement[self::ARGUMENTS]);
             }
 
@@ -220,9 +223,9 @@ public function flush($async = true)
     private function readColumn($entity, $metadata)
     {
         foreach ($metadata->fieldMappings as $field) {
-            $getterMethod = 'get' . ucfirst($field['fieldName']);
+            $getterMethod = 'get'.ucfirst($field['fieldName']);
             if (null !== $entity->{$getterMethod}()) {
-                if($this->isCassandraType($entity->{$getterMethod}())) {
+                if ($this->isCassandraType($entity->{$getterMethod}())) {
                     $values[$field['columnName']] = $entity->{$getterMethod}();
                 } else {
                     $values[$field['columnName']] = $this->encodeColumnType($field['type'], $entity->{$getterMethod}());
@@ -242,20 +245,21 @@ private function readColumn($entity, $metadata)
      */
     private function isCassandraType($obj)
     {
-        $classNames = array('\Cassandra\Collection', '\Cassandra\Custom', '\Cassandra\Map', '\Cassandra\Scalar', '\Cassandra\Set', '\Cassandra\Tuple', '\Cassandra\UserType');
+        $classNames = ['\Cassandra\Collection', '\Cassandra\Custom', '\Cassandra\Map', '\Cassandra\Scalar', '\Cassandra\Set', '\Cassandra\Tuple', '\Cassandra\UserType'];
         foreach ($classNames as $className) {
             if (is_a($obj, $className)) {
                 return true;
             }
         }
+
         return false;
     }
 
     /**
      * Return $value with appropriate $type.
      *
      * @param string $type
-     * @param mixed $value
+     * @param mixed  $value
      *
      * @return mixed
      */
@@ -297,28 +301,28 @@ private function encodeColumnType($type, $value = null)
 
     private function decodeColumnType($columnValue)
     {
-        if ($columnValue === null) {
+        if (null === $columnValue) {
             return $columnValue;
         }
 
         try {
-            if (is_bool($columnValue)) {
+            if (\is_bool($columnValue)) {
                 return $columnValue;
             }
             // Cassandra\Timestamp class
-            if ($columnValue instanceOf \Cassandra\Timestamp) {
+            if ($columnValue instanceof \Cassandra\Timestamp) {
                 return $columnValue->time();
             }
             // Cassandra\Date class
-            if ($columnValue instanceOf \Cassandra\Date) {
+            if ($columnValue instanceof \Cassandra\Date) {
                 return $columnValue->seconds();
             }
             // Cassandra\Time class
-            if ($columnValue instanceOf \Cassandra\Time) {
+            if ($columnValue instanceof \Cassandra\Time) {
                 return $columnValue->seconds();
             }
             // Cassandra\Map class
-            if ($columnValue instanceOf \Cassandra\Map) {
+            if ($columnValue instanceof \Cassandra\Map) {
                 $decodedKeys = [];
                 foreach ($columnValue->keys() as $key) {
                     $decodedKeys[] = $this->decodeColumnType($key);
@@ -331,7 +335,7 @@ private function decodeColumnType($columnValue)
                 return array_combine($decodedKeys, $decodedValues);
             }
             // Cassandra\Set class
-            if ($columnValue instanceOf \Cassandra\Set) {
+            if ($columnValue instanceof \Cassandra\Set) {
                 $decodedValues = [];
                 foreach ($columnValue->values() as $value) {
                     $decodedValues[] = $this->decodeColumnType($value);
@@ -340,7 +344,7 @@ private function decodeColumnType($columnValue)
                 return $decodedValues;
             }
 
-            return (string)$columnValue;
+            return (string) $columnValue;
         } catch (\Exception $e) {
             return $columnValue->values();
         }
@@ -361,10 +365,10 @@ public function cleanRow($cassandraRow)
     /**
      * Finds an Entity by its identifier.
      *
-     * @param ClassMetadata $metadata The metadata of the entity to find.
-     * @param mixed $id The identity of the entity to find.
+     * @param ClassMetadata $metadata the metadata of the entity to find
+     * @param mixed         $id       the identity of the entity to find
      *
-     * @return object|null The entity instance or NULL if the entity can not be found.
+     * @return object|null the entity instance or NULL if the entity can not be found
      */
     public function find(ClassMetadata $metadata, $id)
     {
@@ -374,7 +378,7 @@ public function find(ClassMetadata $metadata, $id)
             try {
                 $query->addParameter($id, 'uuid');
             } catch (\Cassandra\Exception\InvalidArgumentException $e) {
-                $this->logger->error('CASSANDRA: ' . $e->getMessage());
+                $this->logger->error('CASSANDRA: '.$e->getMessage());
 
                 return;
             }
@@ -386,11 +390,11 @@ public function find(ClassMetadata $metadata, $id)
     }
 
     /**
-     * Finds all entities
+     * Finds all entities.
      *
-     * @param ClassMetadata $metadata The metadata of the entity to find.
+     * @param ClassMetadata $metadata the metadata of the entity to find
      *
-     * @return ArrayCollection The array of entity instance or empty array if the entity can not be found.
+     * @return ArrayCollection the array of entity instance or empty array if the entity can not be found
      */
     public function findAll(ClassMetadata $metadata)
     {

Cassandra/ORM/EntityRepository.php

@@ -34,8 +34,8 @@ class EntityRepository
     /**
      * Initializes a new <tt>EntityRepository</tt>.
      *
-     * @param EntityManager         $em    The EntityManager to use.
-     * @param Mapping\ClassMetadata $class The class descriptor.
+     * @param EntityManager         $em    the EntityManager to use
+     * @param Mapping\ClassMetadata $class the class descriptor
      */
     public function __construct($em, Mapping\ClassMetadata $class)
     {

Cassandra/ORM/Mapping/ClassMetadata.php

@@ -37,7 +37,7 @@ class ClassMetadata
      *
      * @var array
      */
-    public $fieldMappings = array();
+    public $fieldMappings = [];
 
     /**
      * READ-ONLY: An array of field names. Used to look up field names from column names.
@@ -46,7 +46,7 @@ class ClassMetadata
      *
      * @var array
      */
-    public $fieldNames = array();
+    public $fieldNames = [];
 
     /**
      * READ-ONLY: The primary table definition. The definition is an array with the
@@ -63,7 +63,7 @@ class ClassMetadata
     /**
      * Creates a string representation of this instance.
      *
-     * @return string The string representation of this instance.
+     * @return string the string representation of this instance
      *
      * @todo Construct meaningful string representation.
      */