Skip to content
Snippets Groups Projects
Commit d45b41ad authored by Katharina Drexel's avatar Katharina Drexel Committed by Robin Gustafsson
Browse files

Removing obsolete patches. 


Signed-off-by: default avatarKatharina Drexel <katharina.drexel@bfh.ch>
parent ea03ae14
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
debian/patches/0001-cast-to-int.patch deleted 100644 → 0
+ 0
− 38
View file @ ea03ae14
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Wed, 28 Apr 2021 08:18:19 -0500
Subject: cast to int
Origin: https://github.com/laravel/framework/commit/09bf1457e9df53e172e6fd5929cbafb539677c7c
Applied-Upstream: 6.20.26
---
src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
index f0a0bfc..88a7df3 100755
--- a/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
+++ b/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
@@ -60,8 +60,8 @@ class SqlServerGrammar extends Grammar
// If there is a limit on the query, but not an offset, we will add the top
// clause to the query, which serves as a "limit" type clause within the
// SQL Server system similar to the limit keywords available in MySQL.
- if ($query->limit > 0 && $query->offset <= 0) {
- $select .= 'top '.$query->limit.' ';
+ if (is_numeric($query->limit) && $query->limit > 0 && $query->offset <= 0) {
+ $select .= 'top '.((int) $query->limit).' ';
}
return $select.$this->columnize($columns);
@@ -221,10 +221,10 @@ class SqlServerGrammar extends Grammar
*/
protected function compileRowConstraint($query)
{
- $start = $query->offset + 1;
+ $start = (int) $query->offset + 1;
if ($query->limit > 0) {
- $finish = $query->offset + $query->limit;
+ $finish = (int) $query->offset + (int) $query->limit;
return "between {$start} and {$finish}";
}
debian/patches/0002-Fix-parent-call.patch deleted 100644 → 0
+ 0
− 192
View file @ ea03ae14
From: Dries Vints <dries@vints.io>
Date: Mon, 6 Dec 2021 18:14:03 +0100
Subject: Fix parent call
Origin: https://github.com/laravel/framework/commit/b8174169b1807f36de1837751599e2828ceddb9b
Applied-Upstream: 6.20.42
---
src/Illuminate/View/Compilers/Compiler.php | 2 +-
.../View/Compilers/Concerns/CompilesLayouts.php | 6 ++---
src/Illuminate/View/Concerns/ManagesLayouts.php | 26 +++++++++++++++++++++-
tests/View/ViewBladeCompilerTest.php | 20 ++++++++---------
4 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/Illuminate/View/Compilers/Compiler.php b/src/Illuminate/View/Compilers/Compiler.php
index 08648ad..d2a9f26 100755
--- a/src/Illuminate/View/Compilers/Compiler.php
+++ b/src/Illuminate/View/Compilers/Compiler.php
@@ -48,7 +48,7 @@ abstract class Compiler
*/
public function getCompiledPath($path)
{
- return $this->cachePath.'/'.sha1($path).'.php';
+ return $this->cachePath.'/'.sha1('v2'.$path).'.php';
}
/**
diff --git a/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php b/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php
index aaef617..fc6a63a 100644
--- a/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php
+++ b/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php
@@ -2,8 +2,6 @@
namespace Illuminate\View\Compilers\Concerns;
-use Illuminate\View\Factory as ViewFactory;
-
trait CompilesLayouts
{
/**
@@ -50,7 +48,9 @@ trait CompilesLayouts
*/
protected function compileParent()
{
- return ViewFactory::parentPlaceholder($this->lastSection ?: '');
+ $escapedLastSection = strtr($this->lastSection, ['\\' => '\\\\', "'" => "\\'"]);
+
+ return "<?php echo \Illuminate\View\Factory::parentPlaceholder('{$escapedLastSection}'); ?>";
}
/**
diff --git a/src/Illuminate/View/Concerns/ManagesLayouts.php b/src/Illuminate/View/Concerns/ManagesLayouts.php
index 29d7155..82fb77b 100644
--- a/src/Illuminate/View/Concerns/ManagesLayouts.php
+++ b/src/Illuminate/View/Concerns/ManagesLayouts.php
@@ -3,6 +3,7 @@
namespace Illuminate\View\Concerns;
use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
use InvalidArgumentException;
trait ManagesLayouts
@@ -28,6 +29,13 @@ trait ManagesLayouts
*/
protected static $parentPlaceholder = [];
+ /**
+ * The parent placeholder salt for the request.
+ *
+ * @var string
+ */
+ protected static $parentPlaceholderSalt;
+
/**
* Start injecting content into a section.
*
@@ -168,12 +176,28 @@ trait ManagesLayouts
public static function parentPlaceholder($section = '')
{
if (! isset(static::$parentPlaceholder[$section])) {
- static::$parentPlaceholder[$section] = '##parent-placeholder-'.sha1($section).'##';
+ $salt = static::parentPlaceholderSalt();
+
+ static::$parentPlaceholder[$section] = '##parent-placeholder-'.sha1($salt.$section).'##';
}
return static::$parentPlaceholder[$section];
}
+ /**
+ * Get the parent placeholder salt.
+ *
+ * @return string
+ */
+ protected static function parentPlaceholderSalt()
+ {
+ if (! static::$parentPlaceholderSalt) {
+ return static::$parentPlaceholderSalt = Str::random(40);
+ }
+
+ return static::$parentPlaceholderSalt;
+ }
+
/**
* Check if section exists.
*
diff --git a/tests/View/ViewBladeCompilerTest.php b/tests/View/ViewBladeCompilerTest.php
index fd61b8c..eddf9e2 100644
--- a/tests/View/ViewBladeCompilerTest.php
+++ b/tests/View/ViewBladeCompilerTest.php
@@ -18,7 +18,7 @@ class ViewBladeCompilerTest extends TestCase
public function testIsExpiredReturnsTrueIfCompiledFileDoesntExist()
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
- $files->shouldReceive('exists')->once()->with(__DIR__.'/'.sha1('foo').'.php')->andReturn(false);
+ $files->shouldReceive('exists')->once()->with(__DIR__.'/'.sha1('v2foo').'.php')->andReturn(false);
$this->assertTrue($compiler->isExpired('foo'));
}
@@ -33,23 +33,23 @@ class ViewBladeCompilerTest extends TestCase
public function testIsExpiredReturnsTrueWhenModificationTimesWarrant()
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
- $files->shouldReceive('exists')->once()->with(__DIR__.'/'.sha1('foo').'.php')->andReturn(true);
+ $files->shouldReceive('exists')->once()->with(__DIR__.'/'.sha1('v2foo').'.php')->andReturn(true);
$files->shouldReceive('lastModified')->once()->with('foo')->andReturn(100);
- $files->shouldReceive('lastModified')->once()->with(__DIR__.'/'.sha1('foo').'.php')->andReturn(0);
+ $files->shouldReceive('lastModified')->once()->with(__DIR__.'/'.sha1('v2foo').'.php')->andReturn(0);
$this->assertTrue($compiler->isExpired('foo'));
}
public function testCompilePathIsProperlyCreated()
{
$compiler = new BladeCompiler($this->getFiles(), __DIR__);
- $this->assertEquals(__DIR__.'/'.sha1('foo').'.php', $compiler->getCompiledPath('foo'));
+ $this->assertEquals(__DIR__.'/'.sha1('v2foo').'.php', $compiler->getCompiledPath('foo'));
}
public function testCompileCompilesFileAndReturnsContents()
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
$files->shouldReceive('get')->once()->with('foo')->andReturn('Hello World');
- $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('foo').'.php', 'Hello World<?php /**PATH foo ENDPATH**/ ?>');
+ $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('v2foo').'.php', 'Hello World<?php /**PATH foo ENDPATH**/ ?>');
$compiler->compile('foo');
}
@@ -57,7 +57,7 @@ class ViewBladeCompilerTest extends TestCase
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
$files->shouldReceive('get')->once()->with('foo')->andReturn('Hello World');
- $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('foo').'.php', 'Hello World<?php /**PATH foo ENDPATH**/ ?>');
+ $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('v2foo').'.php', 'Hello World<?php /**PATH foo ENDPATH**/ ?>');
$compiler->compile('foo');
$this->assertSame('foo', $compiler->getPath());
}
@@ -73,7 +73,7 @@ class ViewBladeCompilerTest extends TestCase
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
$files->shouldReceive('get')->once()->with('foo')->andReturn('Hello World');
- $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('foo').'.php', 'Hello World<?php /**PATH foo ENDPATH**/ ?>');
+ $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('v2foo').'.php', 'Hello World<?php /**PATH foo ENDPATH**/ ?>');
// set path before compilation
$compiler->setPath('foo');
// trigger compilation with $path
@@ -103,7 +103,7 @@ class ViewBladeCompilerTest extends TestCase
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
$files->shouldReceive('get')->once()->with('foo')->andReturn($content);
- $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('foo').'.php', $compiled);
+ $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('v2foo').'.php', $compiled);
$compiler->compile('foo');
}
@@ -157,7 +157,7 @@ class ViewBladeCompilerTest extends TestCase
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
$files->shouldReceive('get')->once()->with('')->andReturn('Hello World');
- $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('').'.php', 'Hello World');
+ $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('v2').'.php', 'Hello World');
$compiler->setPath('');
$compiler->compile();
}
@@ -166,7 +166,7 @@ class ViewBladeCompilerTest extends TestCase
{
$compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
$files->shouldReceive('get')->once()->with(null)->andReturn('Hello World');
- $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1(null).'.php', 'Hello World');
+ $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('v2').'.php', 'Hello World');
$compiler->setPath(null);
$compiler->compile();
}
debian/patches/0003-Add-.phar-to-blocked-PHP-extensions-39666.patch deleted 100644 → 0
+ 0
− 26
View file @ ea03ae14
From: Stephen Rees-Carter <stephen@rees-carter.net>
Date: Thu, 18 Nov 2021 12:10:56 +1000
Subject: Add .phar to blocked PHP extensions (#39666)
By default Debian includes support for executing .phar files alongside
.php and .phtml files, and should be included in the blocked list.
Origin: https://github.com/laravel/framework/commit/ccea1bfcbb37cf923dc1bb30cdbf2effbfb1619c
Applied-Upstream: 6.20.41
---
src/Illuminate/Validation/Concerns/ValidatesAttributes.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
index 84e0964..6f0d8d6 100644
--- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
+++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1254,7 +1254,7 @@ trait ValidatesAttributes
}
$phpExtensions = [
- 'php', 'php3', 'php4', 'php5', 'phtml',
+ 'php', 'php3', 'php4', 'php5', 'phtml', 'phar',
];
return ($value instanceof UploadedFile)
debian/patches/series deleted 100644 → 0
+ 0
− 3
View file @ ea03ae14
0001-cast-to-int.patch
0002-Fix-parent-call.patch
0003-Add-.phar-to-blocked-PHP-extensions-39666.patch
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment