Laravel version update

Laravel version update

vendor/sebastian/environment/src/Console.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * This file is part of the Environment package.
+ * This file is part of sebastian/environment.
  *
  * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
@@ -8,14 +8,25 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace SebastianBergmann\Environment;
 
-/**
- */
-class Console
+final class Console
 {
+    /**
+     * @var int
+     */
     const STDIN  = 0;
+
+    /**
+     * @var int
+     */
     const STDOUT = 1;
+
+    /**
+     * @var int
+     */
     const STDERR = 2;
 
     /**
@@ -23,17 +34,19 @@ class Console
      *
      * This code has been copied and adapted from
      * Symfony\Component\Console\Output\OutputStream.
-     *
-     * @return bool
      */
-    public function hasColorSupport()
+    public function hasColorSupport(): bool
     {
-        if (DIRECTORY_SEPARATOR == '\\') {
-            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM');
+        if ($this->isWindows()) {
+            // @codeCoverageIgnoreStart
+            return false !== \getenv('ANSICON') || 'ON' === \getenv('ConEmuANSI') || 'xterm' === \getenv('TERM');
+            // @codeCoverageIgnoreEnd
         }
 
-        if (!defined('STDOUT')) {
+        if (!\defined('STDOUT')) {
+            // @codeCoverageIgnoreStart
             return false;
+            // @codeCoverageIgnoreEnd
         }
 
         return $this->isInteractive(STDOUT);
@@ -42,55 +55,48 @@ class Console
     /**
      * Returns the number of columns of the terminal.
      *
-     * @return int
+     * @codeCoverageIgnore
      */
-    public function getNumberOfColumns()
+    public function getNumberOfColumns(): int
     {
-        if (DIRECTORY_SEPARATOR == '\\') {
-            $columns = 80;
-
-            if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
-                $columns = $matches[1];
-            } elseif (function_exists('proc_open')) {
-                $process = proc_open(
-                    'mode CON',
-                    array(
-                        1 => array('pipe', 'w'),
-                        2 => array('pipe', 'w')
-                    ),
-                    $pipes,
-                    null,
-                    null,
-                    array('suppress_errors' => true)
-                );
-
-                if (is_resource($process)) {
-                    $info = stream_get_contents($pipes[1]);
-
-                    fclose($pipes[1]);
-                    fclose($pipes[2]);
-                    proc_close($process);
-
-                    if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                        $columns = $matches[2];
-                    }
-                }
-            }
-
-            return $columns - 1;
+        if ($this->isWindows()) {
+            return $this->getNumberOfColumnsWindows();
         }
 
         if (!$this->isInteractive(self::STDIN)) {
             return 80;
         }
 
-        if (function_exists('shell_exec') && preg_match('#\d+ (\d+)#', shell_exec('stty size'), $match) === 1) {
+        return $this->getNumberOfColumnsInteractive();
+    }
+
+    /**
+     * Returns if the file descriptor is an interactive terminal or not.
+     *
+     * @param int|resource $fileDescriptor
+     */
+    public function isInteractive($fileDescriptor = self::STDOUT): bool
+    {
+        return \function_exists('posix_isatty') && @\posix_isatty($fileDescriptor);
+    }
+
+    private function isWindows(): bool
+    {
+        return DIRECTORY_SEPARATOR === '\\';
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    private function getNumberOfColumnsInteractive(): int
+    {
+        if (\function_exists('shell_exec') && \preg_match('#\d+ (\d+)#', \shell_exec('stty size') ?? '', $match) === 1) {
             if ((int) $match[1] > 0) {
                 return (int) $match[1];
             }
         }
 
-        if (function_exists('shell_exec') && preg_match('#columns = (\d+);#', shell_exec('stty'), $match) === 1) {
+        if (\function_exists('shell_exec') && \preg_match('#columns = (\d+);#', \shell_exec('stty') ?? '', $match) === 1) {
             if ((int) $match[1] > 0) {
                 return (int) $match[1];
             }
@@ -100,14 +106,41 @@ class Console
     }
 
     /**
-     * Returns if the file descriptor is an interactive terminal or not.
-     *
-     * @param int|resource $fileDescriptor
-     *
-     * @return bool
+     * @codeCoverageIgnore
      */
-    public function isInteractive($fileDescriptor = self::STDOUT)
+    private function getNumberOfColumnsWindows(): int
     {
-        return function_exists('posix_isatty') && @posix_isatty($fileDescriptor);
+        $ansicon = \getenv('ANSICON');
+        $columns = 80;
+
+        if (\is_string($ansicon) && \preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', \trim($ansicon), $matches)) {
+            $columns = $matches[1];
+        } elseif (\function_exists('proc_open')) {
+            $process = \proc_open(
+                'mode CON',
+                [
+                    1 => ['pipe', 'w'],
+                    2 => ['pipe', 'w']
+                ],
+                $pipes,
+                null,
+                null,
+                ['suppress_errors' => true]
+            );
+
+            if (\is_resource($process)) {
+                $info = \stream_get_contents($pipes[1]);
+
+                \fclose($pipes[1]);
+                \fclose($pipes[2]);
+                \proc_close($process);
+
+                if (\preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
+                    $columns = $matches[2];
+                }
+            }
+        }
+
+        return $columns - 1;
     }
 }

vendor/sebastian/environment/src/OperatingSystem.php

@@ -0,0 +1,51 @@
+<?php
+/*
+ * This file is part of sebastian/environment.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace SebastianBergmann\Environment;
+
+final class OperatingSystem
+{
+    /**
+     * Returns PHP_OS_FAMILY (if defined (which it is on PHP >= 7.2)).
+     * Returns a string (compatible with PHP_OS_FAMILY) derived from PHP_OS otherwise.
+     */
+    public function getFamily(): string
+    {
+        if (\defined('PHP_OS_FAMILY')) {
+            return PHP_OS_FAMILY;
+        }
+
+        if (DIRECTORY_SEPARATOR === '\\') {
+            return 'Windows';
+        }
+
+        switch (PHP_OS) {
+            case 'Darwin':
+                return 'Darwin';
+
+            case 'DragonFly':
+            case 'FreeBSD':
+            case 'NetBSD':
+            case 'OpenBSD':
+                return 'BSD';
+
+            case 'Linux':
+                return 'Linux';
+
+            case 'SunOS':
+                return 'Solaris';
+
+            default:
+                return 'Unknown';
+        }
+    }
+}

vendor/sebastian/environment/src/Runtime.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * This file is part of the Environment package.
+ * This file is part of sebastian/environment.
  *
  * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
@@ -8,12 +8,14 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace SebastianBergmann\Environment;
 
 /**
  * Utility class for HHVM/PHP environment handling.
  */
-class Runtime
+final class Runtime
 {
     /**
      * @var string
@@ -22,161 +24,151 @@ class Runtime
 
     /**
      * Returns true when Xdebug is supported or
-     * the runtime used is PHPDBG (PHP >= 7.0).
-     *
-     * @return bool
+     * the runtime used is PHPDBG.
      */
-    public function canCollectCodeCoverage()
+    public function canCollectCodeCoverage(): bool
     {
         return $this->hasXdebug() || $this->hasPHPDBGCodeCoverage();
     }
 
+    /**
+     * Returns true when OPcache is loaded and opcache.save_comments=0 is set.
+     *
+     * Code taken from Doctrine\Common\Annotations\AnnotationReader::__construct().
+     */
+    public function discardsComments(): bool
+    {
+        if (\extension_loaded('Zend Optimizer+') && (\ini_get('zend_optimizerplus.save_comments') === '0' || \ini_get('opcache.save_comments') === '0')) {
+            return true;
+        }
+
+        if (\extension_loaded('Zend OPcache') && \ini_get('opcache.save_comments') == 0) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Returns the path to the binary of the current runtime.
      * Appends ' --php' to the path when the runtime is HHVM.
-     *
-     * @return string
      */
-    public function getBinary()
+    public function getBinary(): string
     {
         // HHVM
         if (self::$binary === null && $this->isHHVM()) {
-            if ((self::$binary = getenv('PHP_BINARY')) === false) {
+            // @codeCoverageIgnoreStart
+            if ((self::$binary = \getenv('PHP_BINARY')) === false) {
                 self::$binary = PHP_BINARY;
             }
 
-            self::$binary = escapeshellarg(self::$binary) . ' --php';
+            self::$binary = \escapeshellarg(self::$binary) . ' --php' .
+                ' -d hhvm.php7.all=1';
+            // @codeCoverageIgnoreEnd
         }
 
-        // PHP >= 5.4.0
-        if (self::$binary === null && defined('PHP_BINARY')) {
-            if (PHP_BINARY !== '') {
-                self::$binary = escapeshellarg(PHP_BINARY);
-            }
-        }
-
-        // PHP < 5.4.0
-        if (self::$binary === null) {
-            if (PHP_SAPI == 'cli' && isset($_SERVER['_'])) {
-                if (strpos($_SERVER['_'], 'phpunit') !== false) {
-                    $file = file($_SERVER['_']);
-
-                    if (strpos($file[0], ' ') !== false) {
-                        $tmp          = explode(' ', $file[0]);
-                        self::$binary = escapeshellarg(trim($tmp[1]));
-                    } else {
-                        self::$binary = escapeshellarg(ltrim(trim($file[0]), '#!'));
-                    }
-                } elseif (strpos(basename($_SERVER['_']), 'php') !== false) {
-                    self::$binary = escapeshellarg($_SERVER['_']);
-                }
-            }
+        if (self::$binary === null && PHP_BINARY !== '') {
+            self::$binary = \escapeshellarg(PHP_BINARY);
         }
 
         if (self::$binary === null) {
-            $possibleBinaryLocations = array(
+            // @codeCoverageIgnoreStart
+            $possibleBinaryLocations = [
                 PHP_BINDIR . '/php',
                 PHP_BINDIR . '/php-cli.exe',
                 PHP_BINDIR . '/php.exe'
-            );
+            ];
 
             foreach ($possibleBinaryLocations as $binary) {
-                if (is_readable($binary)) {
-                    self::$binary = escapeshellarg($binary);
+                if (\is_readable($binary)) {
+                    self::$binary = \escapeshellarg($binary);
                     break;
                 }
             }
+            // @codeCoverageIgnoreEnd
         }
 
         if (self::$binary === null) {
+            // @codeCoverageIgnoreStart
             self::$binary = 'php';
+            // @codeCoverageIgnoreEnd
         }
 
         return self::$binary;
     }
 
-    /**
-     * @return string
-     */
-    public function getNameWithVersion()
+    public function getNameWithVersion(): string
     {
         return $this->getName() . ' ' . $this->getVersion();
     }
 
-    /**
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         if ($this->isHHVM()) {
+            // @codeCoverageIgnoreStart
             return 'HHVM';
-        } elseif ($this->isPHPDBG()) {
+            // @codeCoverageIgnoreEnd
+        }
+
+        if ($this->isPHPDBG()) {
+            // @codeCoverageIgnoreStart
             return 'PHPDBG';
-        } else {
-            return 'PHP';
+            // @codeCoverageIgnoreEnd
         }
+
+        return 'PHP';
     }
 
-    /**
-     * @return string
-     */
-    public function getVendorUrl()
+    public function getVendorUrl(): string
     {
         if ($this->isHHVM()) {
+            // @codeCoverageIgnoreStart
             return 'http://hhvm.com/';
-        } else {
-            return 'https://secure.php.net/';
+            // @codeCoverageIgnoreEnd
         }
+
+        return 'https://secure.php.net/';
     }
 
-    /**
-     * @return string
-     */
-    public function getVersion()
+    public function getVersion(): string
     {
         if ($this->isHHVM()) {
+            // @codeCoverageIgnoreStart
             return HHVM_VERSION;
-        } else {
-            return PHP_VERSION;
+            // @codeCoverageIgnoreEnd
         }
+
+        return PHP_VERSION;
     }
 
     /**
      * Returns true when the runtime used is PHP and Xdebug is loaded.
-     *
-     * @return bool
      */
-    public function hasXdebug()
+    public function hasXdebug(): bool
     {
-        return ($this->isPHP() || $this->isHHVM()) && extension_loaded('xdebug');
+        return ($this->isPHP() || $this->isHHVM()) && \extension_loaded('xdebug');
     }
 
     /**
      * Returns true when the runtime used is HHVM.
-     *
-     * @return bool
      */
-    public function isHHVM()
+    public function isHHVM(): bool
     {
-        return defined('HHVM_VERSION');
+        return \defined('HHVM_VERSION');
     }
 
     /**
      * Returns true when the runtime used is PHP without the PHPDBG SAPI.
-     *
-     * @return bool
      */
-    public function isPHP()
+    public function isPHP(): bool
     {
         return !$this->isHHVM() && !$this->isPHPDBG();
     }
 
     /**
      * Returns true when the runtime used is PHP with the PHPDBG SAPI.
-     *
-     * @return bool
      */
-    public function isPHPDBG()
+    public function isPHPDBG(): bool
     {
         return PHP_SAPI === 'phpdbg' && !$this->isHHVM();
     }
@@ -185,10 +177,10 @@ class Runtime
      * Returns true when the runtime used is PHP with the PHPDBG SAPI
      * and the phpdbg_*_oplog() functions are available (PHP >= 7.0).
      *
-     * @return bool
+     * @codeCoverageIgnore
      */
-    public function hasPHPDBGCodeCoverage()
+    public function hasPHPDBGCodeCoverage(): bool
     {
-        return $this->isPHPDBG() && function_exists('phpdbg_start_oplog');
+        return $this->isPHPDBG();
     }
 }