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.

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

Remove forbidden @author tag from framework (part 1) #37018

Open
wants to merge 22 commits into
base: 2.4-develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fe21ce4
Remove forbidden @author tag
fredden Mar 7, 2023
83aa1e9
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/fr…
fredden Mar 20, 2023
97ae81f
Comply with coding standard
fredden Mar 20, 2023
c49ea51
Merge branch '2.4-develop' into no-author/framework-01
engcom-Lima May 18, 2023
08aaf0a
Merge branch '2.4-develop' into no-author/framework-01
engcom-Echo Sep 21, 2023
f25a36d
Fixed static test failures.
engcom-Echo Dec 18, 2023
a880da5
Merge branch '2.4-develop' into no-author/framework-01
engcom-Echo Dec 18, 2023
0e80fb7
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Jun 4, 2024
ebbc7c3
Merge branch '2.4-develop' into no-author/framework-01
fredden Jun 5, 2024
81354ea
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Jun 6, 2024
cc0848d
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Sep 6, 2024
db55613
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Sep 10, 2024
99eabf0
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Sep 12, 2024
4a3bdcf
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Sep 13, 2024
0a808ab
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Sep 16, 2024
fd659bb
Fixing SVC error
Oct 1, 2024
3e157cf
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Oct 1, 2024
0a8fcca
Revert "Fixing SVC error"
fredden Oct 1, 2024
039a0b1
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Oct 3, 2024
ee9550a
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Dec 3, 2024
b35a173
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Dec 4, 2024
1f281a3
Merge branch '2.4-develop' into no-author/framework-01
engcom-Charlie Dec 10, 2024
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: 0 additions & 2 deletions lib/internal/Magento/Framework/Archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

/**
* Class to work with archives
*
* @author Magento Core Team <[email protected]>
*/
class Archive
{
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Archive/AbstractArchive.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Class to work with archives
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Archive;

Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Archive/ArchiveInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Interface for work with archives
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Archive;

Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Archive/Bz.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Class to work with bzip2 archives
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Archive;

Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Archive/Gz.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Class to work with gz archives
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Archive;

Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Archive/Tar.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

/**
* Class to work with tar archives
*
* @author Magento Core Team <[email protected]>
*/
class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
{
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Backup/Archive/Tar.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Extended version of \Magento\Framework\Archive\Tar that supports filtering
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Backup\Archive;

Expand Down
3 changes: 1 addition & 2 deletions lib/internal/Magento/Framework/Backup/BackupInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@

/**
* Interface for work with archives
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Backup;

/**
* @api
*
* @deprecated 101.0.7 Backups should be done using other means.
* @see Nothing
* @since 100.0.2
*/
interface BackupInterface
Expand Down
1 change: 0 additions & 1 deletion lib/internal/Magento/Framework/Backup/Db.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
/**
* Class to work with database backups
*
* @author Magento Core Team <[email protected]>
* @api
* @since 100.0.2
*/
Expand Down
18 changes: 10 additions & 8 deletions lib/internal/Magento/Framework/Backup/Filesystem.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
Expand All @@ -19,8 +20,6 @@

/**
* Class to work with filesystem backups
*
* @author Magento Core Team <[email protected]>
*/
class Filesystem extends AbstractBackup
{
Expand All @@ -39,15 +38,11 @@ class Filesystem extends AbstractBackup
protected $_useFtp = false;

/**
* Ftp host
*
* @var string
*/
protected $_ftpHost;

/**
* Ftp username
*
* @var string
*/
protected $_ftpUser;
Expand Down Expand Up @@ -125,6 +120,7 @@ public function create()
new Phrase('Not enough permissions to read files for backup')
);
}

$this->validateAvailableDiscSpace($this->getBackupsDir(), $filesInfo['size']);

$tarTmpPath = $this->_getTarTmpPath();
Expand Down Expand Up @@ -160,8 +156,9 @@ public function create()
*
* @param string $backupDir
* @param int $size
*
* @return void
* @throws LocalizedException
* @throws NotEnoughFreeSpace
*/
public function validateAvailableDiscSpace($backupDir, $size)
{
Expand All @@ -184,6 +181,7 @@ public function validateAvailableDiscSpace($backupDir, $size)
* @param string $username
* @param string $password
* @param string $path
*
* @return $this
*/
public function setUseFtp($host, $username, $password, $path)
Expand Down Expand Up @@ -212,6 +210,7 @@ public function getType()
* Add path that should be ignoring when creating or rolling back backup
*
* @param string|array $paths
*
* @return $this
*/
public function addIgnorePaths($paths)
Expand Down Expand Up @@ -243,6 +242,7 @@ public function getIgnorePaths()
* Set directory where backups saved and add it to ignore paths
*
* @param string $backupsDir
*
* @return $this
*
* @see AbstractBackup::setBackupsDir()
Expand Down Expand Up @@ -279,7 +279,7 @@ public function getFtpConnectString()
* Check backups directory existence and whether it's writeable
*
* @return void
* @throws LocalizedException
* @throws NotEnoughPermissions
*/
protected function _checkBackupsDir()
{
Expand Down Expand Up @@ -321,6 +321,7 @@ protected function _getTarTmpPath()
*
* @return Ftp
* @deprecated 101.0.0
* @see Nothing
*/
protected function getRollBackFtp()
{
Expand All @@ -339,6 +340,7 @@ protected function getRollBackFtp()
*
* @return Fs
* @deprecated 101.0.0
* @see Nothing
*/
protected function getRollBackFs()
{
Expand Down
12 changes: 6 additions & 6 deletions lib/internal/Magento/Framework/Backup/Filesystem/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

/**
* Filesystem helper
*
* @author Magento Core Team <[email protected]>
*/
class Helper
{
Expand All @@ -22,38 +20,39 @@ class Helper
*
* @const int
*/
const INFO_WRITABLE = 1;
public const INFO_WRITABLE = 1;

/**
* Constant can be used in getInfo() function as second parameter.
* Check whether directory and all files/sub directories are readable
*
* @const int
*/
const INFO_READABLE = 2;
public const INFO_READABLE = 2;

/**
* Constant can be used in getInfo() function as second parameter.
* Get directory size
*
* @const int
*/
const INFO_SIZE = 4;
public const INFO_SIZE = 4;

/**
* Constant can be used in getInfo() function as second parameter.
* Combination of INFO_WRITABLE, INFO_READABLE, INFO_SIZE
*
* @const int
*/
const INFO_ALL = 7;
public const INFO_ALL = 7;

/**
* Recursively delete $path
*
* @param string $path
* @param array $skipPaths
* @param bool $removeRoot
*
* @return void
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.ShortMethodName)
Expand Down Expand Up @@ -82,6 +81,7 @@ public function rm($path, $skipPaths = [], $removeRoot = false)
* @param string $path
* @param int $infoOptions
* @param array $skipFiles
*
* @return array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* File lines iterator
*
* @author Magento Core Team <[email protected]>
*/
class File extends \SplFileObject
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Filter \Iterator
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Backup\Filesystem\Iterator;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

/**
* Rollback worker for rolling back via local filesystem
*
* @author Magento Core Team <[email protected]>
*/
class Fs extends AbstractRollback
{
Expand Down Expand Up @@ -98,6 +96,7 @@ public function run()
*
* @return Helper
* @deprecated 101.0.0
* @see Nothing
*/
private function getFsHelper()
{
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Backup/Media.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Class to work media folder and database backups
*
* @author Magento Core Team <[email protected]>
*/
class Media extends Snapshot
{
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Backup/Nomedia.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Class to work system backup that excludes media folder
*
* @author Magento Core Team <[email protected]>
*/
class Nomedia extends \Magento\Framework\Backup\Media
{
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Backup/Snapshot.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Class to work with full filesystem and database backups
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Backup;

Expand Down
11 changes: 9 additions & 2 deletions lib/internal/Magento/Framework/DB/Statement/Parameter.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<?php

/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\Framework\DB\Statement;

/**
Expand All @@ -12,8 +14,6 @@
* way to the query.
* Most used properties and methods are defined in interface. Specific things for concrete DB adapter can be
* transmitted using 'addtional' property (\Magento\Framework\DataObject) as a container.
*
* @author Magento Core Team <[email protected]>
*/
class Parameter
{
Expand Down Expand Up @@ -74,6 +74,7 @@ public function __construct($value)
* Sets parameter value.
*
* @param mixed $value
*
* @return $this
*/
public function setValue($value)
Expand All @@ -100,6 +101,7 @@ public function getValue()
* as a BLOB value.
*
* @param bool $isBlob
*
* @return $this
*/
public function setIsBlob($isBlob)
Expand All @@ -126,6 +128,7 @@ public function getIsBlob()
* Sets data type option to be used during binding parameter value.
*
* @param mixed $dataType
*
* @return $this
*/
public function setDataType($dataType)
Expand All @@ -148,6 +151,7 @@ public function getDataType()
* Sets length option to be used during binding parameter value.
*
* @param mixed $length
*
* @return $this
*/
public function setLength($length)
Expand All @@ -170,6 +174,7 @@ public function getLength()
* Sets specific driver options to be used during binding parameter value.
*
* @param mixed $driverOptions
*
* @return $this
*/
public function setDriverOptions($driverOptions)
Expand All @@ -190,9 +195,11 @@ public function getDriverOptions()

/**
* Sets additional information for concrete DB adapter.
*
* Set there any data you want to pass along with query parameter.
*
* @param \Magento\Framework\DataObject $additional
*
* @return $this
*/
public function setAdditional($additional)
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Mysql DB Statement
*
* @author Magento Core Team <[email protected]>
*/
class Mysql extends \Zend_Db_Statement_Pdo
{
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Data/Form/AbstractForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

/**
* Abstract class for form, column and fieldset
*
* @author Magento Core Team <[email protected]>
*/
class AbstractForm extends \Magento\Framework\DataObject
{
Expand Down