summaryrefslogtreecommitdiff
path: root/vendor/illuminate
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-12-19 15:03:10 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-12-19 15:03:10 +0000
commit4f7164e2376df0597a3b4c994874026b07c1cfa6 (patch)
tree74af353f0e2683a6871f5c7642e328d0a06ad694 /vendor/illuminate
parentec20056403c14e7c80aff330b8b6fb1bcc1b39b1 (diff)
downloadwebtrees-4f7164e2376df0597a3b4c994874026b07c1cfa6.tar.gz
webtrees-4f7164e2376df0597a3b4c994874026b07c1cfa6.tar.bz2
webtrees-4f7164e2376df0597a3b4c994874026b07c1cfa6.zip
Update vendor dependencies
Diffstat (limited to 'vendor/illuminate')
-rwxr-xr-xvendor/illuminate/database/Schema/Blueprint.php11
-rwxr-xr-xvendor/illuminate/database/Schema/Grammars/PostgresGrammar.php11
-rwxr-xr-xvendor/illuminate/support/ServiceProvider.php2
3 files changed, 23 insertions, 1 deletions
diff --git a/vendor/illuminate/database/Schema/Blueprint.php b/vendor/illuminate/database/Schema/Blueprint.php
index a08f5be49a..f555c44b77 100755
--- a/vendor/illuminate/database/Schema/Blueprint.php
+++ b/vendor/illuminate/database/Schema/Blueprint.php
@@ -1181,6 +1181,17 @@ class Blueprint
}
/**
+ * Create a new multipolygon column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Schema\ColumnDefinition
+ */
+ public function multiPolygonZ($column)
+ {
+ return $this->addColumn('multipolygonz', $column);
+ }
+
+ /**
* Create a new generated, computed column on the table.
*
* @param string $column
diff --git a/vendor/illuminate/database/Schema/Grammars/PostgresGrammar.php b/vendor/illuminate/database/Schema/Grammars/PostgresGrammar.php
index 6edf18eb5f..0f85bc96b3 100755
--- a/vendor/illuminate/database/Schema/Grammars/PostgresGrammar.php
+++ b/vendor/illuminate/database/Schema/Grammars/PostgresGrammar.php
@@ -869,6 +869,17 @@ class PostgresGrammar extends Grammar
}
/**
+ * Create the column definition for a spatial MultiPolygonZ type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMultiPolygonZ(Fluent $column)
+ {
+ return $this->formatPostGisType('multipolygonz');
+ }
+
+ /**
* Format the column definition for a PostGIS spatial type.
*
* @param string $type
diff --git a/vendor/illuminate/support/ServiceProvider.php b/vendor/illuminate/support/ServiceProvider.php
index a20530450e..7fd1410a47 100755
--- a/vendor/illuminate/support/ServiceProvider.php
+++ b/vendor/illuminate/support/ServiceProvider.php
@@ -94,7 +94,7 @@ abstract class ServiceProvider
*/
protected function loadViewsFrom($path, $namespace)
{
- if (is_array($this->app->config['view']['paths'])) {
+ if (isset($this->app->config['view']['paths']) && is_array($this->app->config['view']['paths'])) {
foreach ($this->app->config['view']['paths'] as $viewPath) {
if (is_dir($appPath = $viewPath.'/vendor/'.$namespace)) {
$this->app['view']->addNamespace($namespace, $appPath);