Merge branch '7.x' into 8.x

Author: GrahamCampbell

CHANGELOG-6.x.md

@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.18.37...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.18.38...6.x)
+
+
+## [v6.18.38 (2020-09-01)](https://github.com/laravel/framework/compare/v6.18.37...v6.18.38)
+
+### Changed
+- Changed postgres processor ([#34055](https://github.com/laravel/framework/pull/34055))
 
 
 ## [v6.18.37 (2020-08-27)](https://github.com/laravel/framework/compare/v6.18.36...v6.18.37)

CHANGELOG-7.x.md

@@ -1,6 +1,22 @@
 # Release Notes for 7.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v7.26.1...7.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v7.27.0...7.x)
+
+
+## [v7.27.0 (2020-09-01)](https://github.com/laravel/framework/compare/v7.26.1...v7.27.0)
+
+### Added
+- Allow to use alias of morphed model ([#34032](https://github.com/laravel/framework/pull/34032))
+- Introduced basic padding (both, left, right) methods to Str and Stringable ([#34053](https://github.com/laravel/framework/pull/34053))
+
+### Refactoring
+- RefreshDatabase migration commands parameters moved to methods ([#34007](https://github.com/laravel/framework/pull/34007), [8b35c8e](https://github.com/laravel/framework/commit/8b35c8e6ba5879e71fd81fd03b5687ee2b46c55a), [256f71c](https://github.com/laravel/framework/commit/256f71c1f81da2d4bb3e327b18389ac43fa97a72))
+
+### Changed
+- allow to reset forced scheme and root-url in UrlGenerator ([#34039](https://github.com/laravel/framework/pull/34039))
+- Updating the make commands to use a custom views path ([#34060](https://github.com/laravel/framework/pull/34060), [b593c62](https://github.com/laravel/framework/commit/b593c6242942623fcc12638d0390da7c58dbbb11))
+- Using "public static property" in View Component causes an error ([#34058](https://github.com/laravel/framework/pull/34058))
+- Changed postgres processor ([#34055](https://github.com/laravel/framework/pull/34055))
 
 
 ## [v7.26.1 (2020-08-27)](https://github.com/laravel/framework/compare/v7.26.0...v7.26.1)

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -682,7 +682,7 @@ public function joiningTableSegment()
      */
     public function touches($relation)
     {
-        return in_array($relation, $this->touches);
+        return in_array($relation, $this->getTouchedRelations());
     }
 
     /**
@@ -692,7 +692,7 @@ public function touches($relation)
      */
     public function touchOwners()
     {
-        foreach ($this->touches as $relation) {
+        foreach ($this->getTouchedRelations() as $relation) {
             $this->$relation()->touch();
 
             if ($this->$relation instanceof self) {

src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php

@@ -22,6 +22,13 @@ trait InteractsWithConsole
      */
     public $expectedOutput = [];
 
+    /**
+     * All of the expected ouput tables.
+     *
+     * @var array
+     */
+    public $expectedTables = [];
+
     /**
      * All of the expected questions.
      *

src/Illuminate/Testing/PendingCommand.php

@@ -5,10 +5,12 @@
 use Illuminate\Console\OutputStyle;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 use Mockery;
 use Mockery\Exception\NoMatchingExpectationException;
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 
@@ -131,6 +133,27 @@ public function expectsOutput($output)
         return $this;
     }
 
+    /**
+     * Specify a table that should be printed when the command runs.
+     *
+     * @param  array  $headers
+     * @param  \Illuminate\Contracts\Support\Arrayable|array  $rows
+     * @param  string  $tableStyle
+     * @param  array  $columnStyles
+     * @return $this
+     */
+    public function expectsTable($headers, $rows, $tableStyle = 'default', array $columnStyles = [])
+    {
+        $this->test->expectedTables[] = [
+            'headers' => (array) $headers,
+            'rows' => $rows instanceof Arrayable ? $rows->toArray() : $rows,
+            'tableStyle' => $tableStyle,
+            'columnStyles' => $columnStyles,
+        ];
+
+        return $this;
+    }
+
     /**
      * Assert that the command has the given exit code.
      *
@@ -264,6 +287,8 @@ private function createABufferedOutputMock()
                 ->shouldAllowMockingProtectedMethods()
                 ->shouldIgnoreMissing();
 
+        $this->applyTableOutputExpectations($mock);
+
         foreach ($this->test->expectedOutput as $i => $output) {
             $mock->shouldReceive('doWrite')
                 ->once()
@@ -277,6 +302,36 @@ private function createABufferedOutputMock()
         return $mock;
     }
 
+    /**
+     * Apply the output table expectations to the mock.
+     *
+     * @param  \Mockery\MockInterface  $mock
+     * @return void
+     */
+    private function applyTableOutputExpectations($mock)
+    {
+        foreach ($this->test->expectedTables as $consoleTable) {
+            $table = (new Table($output = new BufferedOutput))
+                ->setHeaders($consoleTable['headers'])
+                ->setRows($consoleTable['rows'])
+                ->setStyle($consoleTable['tableStyle']);
+
+            foreach ($consoleTable['columnStyles'] as $columnIndex => $columnStyle) {
+                $table->setColumnStyle($columnIndex, $columnStyle);
+            }
+
+            $table->render();
+
+            $lines = array_filter(
+                preg_split("/\n/", $output->fetch())
+            );
+
+            foreach ($lines as $line) {
+                $this->expectsOutput($line);
+            }
+        }
+    }
+
     /**
      * Handle the object's destruction.
      *