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

Small PHPDocs fixes #20295

Merged
merged 5 commits into from Apr 18, 2019
Merged

Small PHPDocs fixes #20295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b606003
- small phpDocs fixes
Jan 15, 2019
49be805
Update app/code/Magento/Theme/Model/Design/Backend/File.php
orlangur Jan 15, 2019
ab2d3b0
Merge branch '2.3-develop' into phpDoc-refactoring
orlangur Apr 4, 2019
3cbe754
Merge remote-tracking branch 'mainline/2.3-develop' into phpDoc-refac…
nmalevanec Apr 16, 2019
f266f4b
Gix static tests.
nmalevanec Apr 16, 2019
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
1 change: 0 additions & 1 deletion app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
* Upload js file
*
* @return void
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function execute()
{
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Theme/Model/Design/Backend/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ public function beforeSave()
}

/**
* @return array
* @return File
This conversation was marked as resolved.
Show resolved Hide resolved
*
* @throws LocalizedException
*/
public function afterLoad()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ public function __construct(
* Save file to temp media directory
*
* @param string $fileId
*
* @return array
* @throws LocalizedException
*/
public function saveToTmp($fileId)
{
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Theme/Model/ResourceModel/Design.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected function _construct()
* Perform actions before object save
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return $this
* @return void
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
Expand Down Expand Up @@ -152,7 +152,6 @@ protected function _checkIntersection($storeId, $dateFrom, $dateTo, $currentId)
$dateConditions = [];
}

$condition = '';
if (!empty($dateConditions)) {
$condition = '(' . implode(') OR (', $dateConditions) . ')';
$select->where($condition);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/Model/Wysiwyg/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function __construct(
* Upload file
*
* @param string $targetPath
* @return bool
* @return array
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function uploadFile($targetPath)
Expand Down