Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
2f647992
Unverified
Commit
2f647992
authored
Apr 06, 2018
by
Michael Moravec
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bpo/2.7/#3089' into 2.7
Backporting #3089 into 2.7
parents
62be8580
1bf8e3a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
Column.php
lib/Doctrine/DBAL/Schema/Column.php
+1
-1
ColumnTest.php
tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
+13
-0
No files found.
lib/Doctrine/DBAL/Schema/Column.php
View file @
2f647992
...
@@ -132,7 +132,7 @@ class Column extends AbstractAsset
...
@@ -132,7 +132,7 @@ class Column extends AbstractAsset
$name
$name
),
E_USER_DEPRECATED
);
),
E_USER_DEPRECATED
);
return
$this
;
continue
;
}
}
$this
->
$method
(
$value
);
$this
->
$method
(
$value
);
}
}
...
...
tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
View file @
2f647992
...
@@ -65,6 +65,19 @@ class ColumnTest extends \PHPUnit\Framework\TestCase
...
@@ -65,6 +65,19 @@ class ColumnTest extends \PHPUnit\Framework\TestCase
new
Column
(
'foo'
,
$this
->
createMock
(
Type
::
class
),
[
'unknown_option'
=>
'bar'
]);
new
Column
(
'foo'
,
$this
->
createMock
(
Type
::
class
),
[
'unknown_option'
=>
'bar'
]);
}
}
/**
* @group legacy
* @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine 3.0
*/
public
function
testOptionsShouldNotBeIgnored
()
:
void
{
$col1
=
new
Column
(
'bar'
,
Type
::
getType
(
Type
::
INTEGER
),
[
'unknown_option'
=>
'bar'
,
'notnull'
=>
true
]);
self
::
assertTrue
(
$col1
->
getNotnull
());
$col2
=
new
Column
(
'bar'
,
Type
::
getType
(
Type
::
INTEGER
),
[
'unknown_option'
=>
'bar'
,
'notnull'
=>
false
]);
self
::
assertFalse
(
$col2
->
getNotnull
());
}
/**
/**
* @return Column
* @return Column
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment