Changeset 695

Timestamp:

Aug 8, 2019 10:01:13 PM (5 years ago)

Author:

anonymous

Message:

Change usage of is_a($x, 'X') to $x instance of X

Location:

trunk

Files:

• bin/user.cli.php (modified) (1 diff)
• services/css.php (modified) (1 diff)
• services/js.php (modified) (1 diff)
• services/lock.php (modified) (1 diff)
• services/templates/lock.ihtml (modified) (1 diff)
• services/versions.php (modified) (1 diff)
• tests/LockTest.php (modified) (1 diff)
• tests/VersionTest.php (modified) (5 diffs)

trunk/bin/user.cli.php

@@ -61 +61 @@
 }
 
-if (!isset($db) || !is_a($db, 'DB')) {
+if (!isset($db) || !($db instanceof \DB)) {
     echo "This project doesn't have a \$db object.\n";
     exit(1);
 }
 
-if (!isset($auth) || !is_a($auth, 'Auth_SQL')) {
+if (!isset($auth) || !($auth instanceof \Auth_SQL)) {
     echo "This project doesn't have an \$auth object.\n";
     exit(1);

trunk/services/css.php

@@ -28 +28 @@
  * ever modify this file.
  */
-if (is_a($css, 'CSS')) {
+if ($css instanceof \CSS) {
     $css->headers(getFormData('app'));
     $css->output(getFormData('app'));

trunk/services/js.php

@@ -28 +28 @@
  * ever modify this file.
  */
-if (is_a($js, 'JS')) {
+if ($js instanceof \JS) {
     $js->headers(getFormData('app'));
     $js->output(getFormData('app'));

trunk/services/lock.php

@@ -46 +46 @@
 }
 
-if (!isset($lock) || !is_a($lock, 'Lock')) {
+if (!isset($lock) || !($lock instanceof \Lock)) {
     $lock =& Lock::getInstance($auth);
 }

trunk/services/templates/lock.ihtml

@@ -1 +1 @@
 <?php
-if (!is_a($lock, 'Lock')) {
+if (!($lock instanceof \Lock)) {
     // If the Lock object hasn't been instantiated, don't execute this template.
     return null;

trunk/services/versions.php

@@ -107 +107 @@
 
 case 'restore' :
-    if (!isset($lock) || !is_a($lock, 'Lock')) {
+    if (!isset($lock) || !($lock instanceof \Lock)) {
         $lock =& Lock::getInstance($auth);
     }

trunk/tests/LockTest.php

@@ -102 +102 @@
     {
         $result = Lock::getinstance($this->Auth_SQL);
-        $this->assertTrue($result && is_a($result, 'Lock'));
+        $this->assertTrue($result && $result instanceof \Lock);
     }
 

trunk/tests/VersionTest.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -37 +37 @@
 
     function setUp()
-    {   
+    {
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/Version.inc.php';
@@ -84 +84 @@
     {
         $db =& DB::getInstance();
-    
+
         unset($this->Version);
         unset($this->Auth_SQL);
@@ -95 +95 @@
     {
         $result = Version::getinstance($this->Auth_SQL);
-        $this->assertTrue($result && is_a($result, 'Version'));
+        $this->assertTrue($result && $result instanceof Version);
     }