Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

magento/magento2: #8616 #8784

Merged
merged 5 commits into from
Jun 21, 2017
Merged

magento/magento2: #8616 #8784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6bf2f23
magento/magento2 #2370: A PHPDoc comment for \Magento\Config\Model\Co…
Mar 2, 2017
2464c66
magento/magento2 #2370:
Mar 2, 2017
aad5ba9
magento/magento2 #8765:
Mar 3, 2017
ae6a297
magento/magento2 #8765:
Mar 3, 2017
c268d58
magento/magento2 #8616:
Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,6 @@ public function getAttributeRawValue($entityId, $attribute, $store)
$attributesData = $_data[1];
}

return $attributesData ? $attributesData : false;
return $attributesData === false ? false: $attributesData;
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Config/Model/Config/SourceFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
* Create backend model by name
*
* @param string $modelName
* @return mixed
* @return \Magento\Framework\Option\ArrayInterface
*/
public function create($modelName)
{
Expand Down
2 changes: 0 additions & 2 deletions setup/src/Magento/Setup/Test/Unit/Validator/DbValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public function testCheckDatabaseConnection()
['DELETE'],
['CREATE'],
['DROP'],
['REFERENCES'],
['INDEX'],
['ALTER'],
['CREATE TEMPORARY TABLES'],
Expand All @@ -65,7 +64,6 @@ public function testCheckDatabaseConnection()
['SHOW VIEW'],
['CREATE ROUTINE'],
['ALTER ROUTINE'],
['EVENT'],
['TRIGGER'],
];
$accessibleDbs = ['some_db', 'name', 'another_db'];
Expand Down
2 changes: 0 additions & 2 deletions setup/src/Magento/Setup/Validator/DbValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ private function checkDatabasePrivileges(\Magento\Framework\DB\Adapter\AdapterIn
'DELETE',
'CREATE',
'DROP',
'REFERENCES',
'INDEX',
'ALTER',
'CREATE TEMPORARY TABLES',
Expand All @@ -156,7 +155,6 @@ private function checkDatabasePrivileges(\Magento\Framework\DB\Adapter\AdapterIn
'SHOW VIEW',
'CREATE ROUTINE',
'ALTER ROUTINE',
'EVENT',
'TRIGGER'
];

Expand Down