Merge pull request cakephp#1212 from ntzm/use-elvis-operator

Use elvis operator (?:) where possible

Author: ADmad

src/Phinx/Db/Adapter/MysqlAdapter.php

@@ -718,9 +718,9 @@ public function getSqlType($type, $limit = null)
     {
         switch ($type) {
             case static::PHINX_TYPE_STRING:
-                return ['name' => 'varchar', 'limit' => $limit ? $limit : 255];
+                return ['name' => 'varchar', 'limit' => $limit ?: 255];
             case static::PHINX_TYPE_CHAR:
-                return ['name' => 'char', 'limit' => $limit ? $limit : 255];
+                return ['name' => 'char', 'limit' => $limit ?: 255];
             case static::PHINX_TYPE_TEXT:
                 if ($limit) {
                     $sizes = [
@@ -739,9 +739,9 @@ public function getSqlType($type, $limit = null)
 
                 return ['name' => 'text'];
             case static::PHINX_TYPE_BINARY:
-                return ['name' => 'binary', 'limit' => $limit ? $limit : 255];
+                return ['name' => 'binary', 'limit' => $limit ?: 255];
             case static::PHINX_TYPE_VARBINARY:
-                return ['name' => 'varbinary', 'limit' => $limit ? $limit : 255];
+                return ['name' => 'varbinary', 'limit' => $limit ?: 255];
             case static::PHINX_TYPE_BLOB:
                 if ($limit) {
                     $sizes = [

src/Phinx/Db/Adapter/PostgresAdapter.php

@@ -914,8 +914,8 @@ protected function getColumnSqlDefinition(Column $column)
             if (static::PHINX_TYPE_DECIMAL === $sqlType['name'] && ($column->getPrecision() || $column->getScale())) {
                 $buffer[] = sprintf(
                     '(%s, %s)',
-                    $column->getPrecision() ? $column->getPrecision() : $sqlType['precision'],
-                    $column->getScale() ? $column->getScale() : $sqlType['scale']
+                    $column->getPrecision() ?: $sqlType['precision'],
+                    $column->getScale() ?: $sqlType['scale']
                 );
             } elseif (in_array($sqlType['name'], ['geography'])) {
                 // geography type must be written with geometry type and srid, like this: geography(POLYGON,4326)
@@ -926,7 +926,7 @@ protected function getColumnSqlDefinition(Column $column)
                 );
             } elseif (!in_array($sqlType['name'], ['integer', 'smallint', 'bigint'])) {
                 if ($column->getLimit() || isset($sqlType['limit'])) {
-                    $buffer[] = sprintf('(%s)', $column->getLimit() ? $column->getLimit() : $sqlType['limit']);
+                    $buffer[] = sprintf('(%s)', $column->getLimit() ?: $sqlType['limit']);
                 }
             }
 
@@ -1008,9 +1008,7 @@ protected function getIndexSqlDefinition(Index $index, $tableName)
      */
     protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, $tableName)
     {
-        $constraintName = $foreignKey->getConstraint()
-            ? $foreignKey->getConstraint()
-            : $tableName . '_' . implode('_', $foreignKey->getColumns());
+        $constraintName = $foreignKey->getConstraint() ?: $tableName . '_' . implode('_', $foreignKey->getColumns());
 
         $def = ' CONSTRAINT "' . $constraintName . '" FOREIGN KEY ("' . implode('", "', $foreignKey->getColumns()) . '")';
         $def .= " REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable()->getName())} (\"" . implode('", "', $foreignKey->getReferencedColumns()) . '")';

src/Phinx/Db/Adapter/SQLiteAdapter.php

@@ -873,7 +873,7 @@ public function getPhinxType($sqlTypeDef)
             $precision = null;
             $type = $matches[1];
             if (count($matches) > 2) {
-                $limit = $matches[3] ? $matches[3] : null;
+                $limit = $matches[3] ?: null;
             }
             if (count($matches) > 4) {
                 $precision = $matches[5];
@@ -986,7 +986,7 @@ protected function getColumnSqlDefinition(Column $column)
         }
         $limitable = in_array(strtoupper($sqlType['name']), $this->definitionsWithLimits);
         if (($column->getLimit() || isset($sqlType['limit'])) && $limitable) {
-            $def .= '(' . ($column->getLimit() ? $column->getLimit() : $sqlType['limit']) . ')';
+            $def .= '(' . ($column->getLimit() ?: $sqlType['limit']) . ')';
         }
         if (($values = $column->getValues()) && is_array($values)) {
             $def .= " CHECK({$column->getName()} IN ('" . implode("', '", $values) . "'))";

src/Phinx/Db/Adapter/SqlServerAdapter.php

@@ -1034,7 +1034,7 @@ protected function getColumnSqlDefinition(Column $column, $create = true)
             'tinyint'
         ];
         if (!in_array($sqlType['name'], $noLimits) && ($column->getLimit() || isset($sqlType['limit']))) {
-            $buffer[] = sprintf('(%s)', $column->getLimit() ? $column->getLimit() : $sqlType['limit']);
+            $buffer[] = sprintf('(%s)', $column->getLimit() ?: $sqlType['limit']);
         }
         if ($column->getPrecision() && $column->getScale()) {
             $buffer[] = '(' . $column->getPrecision() . ',' . $column->getScale() . ')';
@@ -1097,9 +1097,7 @@ protected function getIndexSqlDefinition(Index $index, $tableName)
      */
     protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, $tableName)
     {
-        $constraintName = $foreignKey->getConstraint()
-            ? $foreignKey->getConstraint()
-            : $tableName . '_' . implode('_', $foreignKey->getColumns());
+        $constraintName = $foreignKey->getConstraint() ?: $tableName . '_' . implode('_', $foreignKey->getColumns());
         $def = ' CONSTRAINT ' . $this->quoteColumnName($constraintName);
         $def .= ' FOREIGN KEY ("' . implode('", "', $foreignKey->getColumns()) . '")';
         $def .= " REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable()->getName())} (\"" . implode('", "', $foreignKey->getReferencedColumns()) . '")';