Skip to content

Commit c90dc06

Browse files
monneratleenooks
authored andcommitted
Rename class Attribute to PLAAttribute.
As PHP 8 introduces a built-in Attribute class, a name clash occurs without this commit. Class names are used by the Visitor class to dynamically build method names. To avoid having to also rename the target methods, a class name mapping is introduced for this purpose. This map may be augmented whenever another similar case occurs.
1 parent 3a75a32 commit c90dc06

12 files changed

+25
-21
lines changed

lib/AttributeFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function newAttribute($name,$values,$server_id,$source=null) {
133133
return $this->newGidAttribute($name,$values,$server_id,$source);
134134

135135
} else {
136-
return new Attribute($name,$values,$server_id,$source);
136+
return new PLAAttribute($name,$values,$server_id,$source);
137137
}
138138
}
139139

lib/BinaryAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class BinaryAttribute extends Attribute {
15+
class BinaryAttribute extends PLAAttribute {
1616
protected $filepaths;
1717
protected $filenames;
1818

lib/DateAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class DateAttribute extends Attribute {
15+
class DateAttribute extends PLAAttribute {
1616
}
1717
?>

lib/DnAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class DnAttribute extends Attribute {
15+
class DnAttribute extends PLAAttribute {
1616
}
1717
?>

lib/GidAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class GidAttribute extends Attribute {
15+
class GidAttribute extends PLAAttribute {
1616
}
1717
?>

lib/MultiLineAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class MultiLineAttribute extends Attribute {
15+
class MultiLineAttribute extends PLAAttribute {
1616
protected $rows = 0;
1717
protected $cols = 0;
1818

lib/ObjectClassAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class ObjectClassAttribute extends Attribute {
15+
class ObjectClassAttribute extends PLAAttribute {
1616
}
1717
?>

lib/Attribute.php renamed to lib/PLAAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class Attribute {
15+
class PLAAttribute {
1616
# Attribute Name
1717
public $name;
1818
# Source of this attribute definition

lib/PasswordAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class PasswordAttribute extends Attribute {
15+
class PasswordAttribute extends PLAAttribute {
1616
}
1717
?>

lib/SelectionAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @package phpLDAPadmin
1313
* @subpackage Templates
1414
*/
15-
class SelectionAttribute extends Attribute {
15+
class SelectionAttribute extends PLAAttribute {
1616
protected $selection = array();
1717
protected $multiple;
1818
protected $default;

0 commit comments

Comments
 (0)