From d86de5ef528427e62527e01d44e8a399ee2c789d Mon Sep 17 00:00:00 2001
From: Damien Seguy <damien.seguy@gmail.com>
Date: Mon, 1 Feb 2016 12:21:06 +0100
Subject: [PATCH] Uses short syntax

---
 library/think/Url.php                      | 2 +-
 library/think/console/input/Definition.php | 2 +-
 library/think/db/Driver.php                | 2 +-
 library/traits/model/Auto.php              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index fd7e9c21..31658862 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -158,7 +158,7 @@ class Url
                     }
                 }
             } else {
-                $domain = $domain . (strpos($domain, '.') ? '' : strstr($_SERVER['HTTP_HOST'], '.'));
+                $domain .= strpos($domain, '.') ? '' : strstr($_SERVER['HTTP_HOST'], '.');
             }
             $domain = (self::isSsl() ? 'https://' : 'http://') . $domain;
         } else {
diff --git a/library/think/console/input/Definition.php b/library/think/console/input/Definition.php
index bfff210b..f04ea157 100644
--- a/library/think/console/input/Definition.php
+++ b/library/think/console/input/Definition.php
@@ -361,7 +361,7 @@ class Definition
             if (!$argument->isRequired()) {
                 $element = '[' . $element . ']';
             } elseif ($argument->isArray()) {
-                $element = $element . ' (' . $element . ')';
+                $element .= ' (' . $element . ')';
             }
 
             if ($argument->isArray()) {
diff --git a/library/think/db/Driver.php b/library/think/db/Driver.php
index aaddc795..49145005 100644
--- a/library/think/db/Driver.php
+++ b/library/think/db/Driver.php
@@ -668,7 +668,7 @@ abstract class Driver
                 $count = count($val);
                 $rule  = isset($val[$count - 1]) ? (is_array($val[$count - 1]) ? strtoupper($val[$count - 1][0]) : strtoupper($val[$count - 1])) : '';
                 if (in_array($rule, ['AND', 'OR', 'XOR'])) {
-                    $count = $count - 1;
+                    --$count;
                 } else {
                     $rule = 'AND';
                 }
diff --git a/library/traits/model/Auto.php b/library/traits/model/Auto.php
index 815aada2..0964cb85 100644
--- a/library/traits/model/Auto.php
+++ b/library/traits/model/Auto.php
@@ -182,7 +182,7 @@ trait Auto
         } elseif (is_array($auto[2])) {
             $flags = 0;
             foreach ($auto[2] as $v) {
-                $flags = $flags | 1 << ($v - 1);
+                $flags |= 1 << ($v - 1);
             }
         } else {
             $flags = 3 == $auto[2] ? 3 : 1 << ($auto[2] - 1);
@@ -302,7 +302,7 @@ trait Auto
         } elseif (is_array($val[5])) {
             $flags = 0;
             foreach ($val[5] as $v) {
-                $flags = $flags | 1 << ($v - 1);
+                $flags |= 1 << ($v - 1);
             }
         } else {
             $flags = 3 == $val[5] ? 3 : 1 << ($val[5] - 1);