Making sure scripts and tests check for GNUSOCIAL defined (instead of STATUSNET)

Orbited plugin may not work at all anymore, I had no means to try it.
But there's a check whether 'LACONICA' is defined there, which is a
very unlikely thing in the future. So far only tests and scripts have
been migrated consistently, though.

diff --git a/plugins/OStatus/tests/FeedDiscoveryTest.php b/plugins/OStatus/tests/FeedDiscoveryTest.php
index ef17efe7cfdff72f649f7e0e1248f8f4ea672cd4..28ac549c8983a87d6df7fda37484d052f2aa4098 100644 (file)
--- a/plugins/OStatus/tests/FeedDiscoveryTest.php
+++ b/plugins/OStatus/tests/FeedDiscoveryTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 require_once INSTALLDIR . '/plugins/OStatus/lib/feeddiscovery.php';

diff --git a/plugins/OStatus/tests/MagicEnvelopeTest.php b/plugins/OStatus/tests/MagicEnvelopeTest.php
index 5ee0362d287a36ac5536aa12e48f7c3fa222cb32..abed4959f950916a7d714d191c00d8698d62254c 100644 (file)
--- a/plugins/OStatus/tests/MagicEnvelopeTest.php
+++ b/plugins/OStatus/tests/MagicEnvelopeTest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/plugins/OStatus/tests/gettext-speedtest.php b/plugins/OStatus/tests/gettext-speedtest.php
index 01b678ab382cadfcea9dfddae97fe54b94d3fcb9..0584af8ef45669b789e08f8b9015825fe59e3683 100644 (file)
--- a/plugins/OStatus/tests/gettext-speedtest.php
+++ b/plugins/OStatus/tests/gettext-speedtest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/scripts/commandline.inc';
 require_once INSTALLDIR . '/extlib/php-gettext/gettext.inc';

diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php
index 87bbecfb44ed57fbcfa21b4d9d4203fd39048efa..ac6522f3d91d157775954bb030207057125a0b21 100755 (executable)
--- a/scripts/fixup_hashtags.php
+++ b/scripts/fixup_hashtags.php
@@ -25,8 +25,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 

diff --git a/scripts/fixup_replies.php b/scripts/fixup_replies.php
index dd55e6ed40ff1b5e1fc61bc574bb02b8c934934c..17d746eb519a69030a6c4c9d437581f33d6f0a9c 100755 (executable)
--- a/scripts/fixup_replies.php
+++ b/scripts/fixup_replies.php
@@ -25,8 +25,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 

diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 1fe513b13baa86f19549b7014ea2bdb8416231f9..e204e747c8354d63c880afb29f76ccb9f270bf3b 100755 (executable)
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -25,8 +25,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 

diff --git a/tests/ActivityGenerationTests.php b/tests/ActivityGenerationTests.php
index 8e59050e75d605062ec6203300519d1fabdba57d..af6535e734b61322db22c3e926389d27b340167d 100644 (file)
--- a/tests/ActivityGenerationTests.php
+++ b/tests/ActivityGenerationTests.php
@@ -8,7 +8,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 // XXX: we should probably have some common source for this stuff
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php
index 6423eaaf03940497deabbbbf95025ab6c8b207ae..801cc22c266a68da092f3e3bd1af31c1fede194a 100644 (file)
--- a/tests/ActivityParseTests.php
+++ b/tests/ActivityParseTests.php
@@ -8,7 +8,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 // XXX: we should probably have some common source for this stuff
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/CommandInterperterTest.php b/tests/CommandInterperterTest.php
index 3ce1cc28211cdedb1a0a3cf5d928d8e1d62242a4..c97bfb1652a0c5a08e72ef6b41ce4cd1d4519e8a 100644 (file)
--- a/tests/CommandInterperterTest.php
+++ b/tests/CommandInterperterTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/CurryTest.php b/tests/CurryTest.php
index 37b66cc749d13ba82fb1d6f40f5c8dab0a5b1566..6e776e41b4f09cd8cc464c886e0e742f65746d8e 100644 (file)
--- a/tests/CurryTest.php
+++ b/tests/CurryTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/HashTagDetectionTests.php b/tests/HashTagDetectionTests.php
index 47031d5bc41bae3ea77292a93cbd4e1755e7020b..1fbc98983d66ab09a400b45990c9794103bf000f 100644 (file)
--- a/tests/HashTagDetectionTests.php
+++ b/tests/HashTagDetectionTests.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/JidValidateTest.php b/tests/JidValidateTest.php
index 9f59011396226b2693c6c74ca3d738f378d43cb8..6c3eef0ed56726578d6a34b93a80a5ee9b809a5d 100644 (file)
--- a/tests/JidValidateTest.php
+++ b/tests/JidValidateTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 mb_internal_encoding('UTF-8'); // @fixme this probably belongs in common.php?
 

diff --git a/tests/LocationTest.php b/tests/LocationTest.php
index 1badecb5db4de7152731bc4bff2e172df6c61264..a8447e1b48cb0bace3959d2150a8657b67c757bd 100644 (file)
--- a/tests/LocationTest.php
+++ b/tests/LocationTest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/MediaFileTest.php b/tests/MediaFileTest.php
index a76a4f45e62968b4d2a1a5609cbb84edc8309724..b1891574e2fca6f0e6c0831c83a72cffede27191 100644 (file)
--- a/tests/MediaFileTest.php
+++ b/tests/MediaFileTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/NicknameTest.php b/tests/NicknameTest.php
index 66e883c049f9cd40116e3f3971dd804a3c64e715..2841398a6590686bf595befcd34e3c6a25317d48 100644 (file)
--- a/tests/NicknameTest.php
+++ b/tests/NicknameTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/TagURITest.php b/tests/TagURITest.php
index d23f8bfe6672214f3024348639f4b36f8a8414bf..ccc80b8064ea0feeaeabacd65aff3525193b2759 100644 (file)
--- a/tests/TagURITest.php
+++ b/tests/TagURITest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index dc017ac616f63bdd2fcae5c607c6f4db0978c090..95d01fb3a9d81062791ea621a20c6cc3aead432b 100644 (file)
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/UUIDTest.php b/tests/UUIDTest.php
index e78d5ce1bce7e71b46f147a23695b6b78ed6c054..ce330d7ac6d8f1d8f612e22a99acc3f4a6cb3890 100644 (file)
--- a/tests/UUIDTest.php
+++ b/tests/UUIDTest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/UserFeedParseTest.php b/tests/UserFeedParseTest.php
index 208e71be69af40276ea197529ff8ea010aa30483..6306adb7729078f925afcf5593b0818aae00bc52 100644 (file)
--- a/tests/UserFeedParseTest.php
+++ b/tests/UserFeedParseTest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 

diff --git a/tests/UserRightsTest.php b/tests/UserRightsTest.php
index 97bf195749d703bde75570f919283f3c13d33730..bd9124a91d38b1dd0cc6dcb793a9b7c12ff4d7d3 100644 (file)
--- a/tests/UserRightsTest.php
+++ b/tests/UserRightsTest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 
@@ -69,4 +70,4 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
         $this->user->grantRole($role);
         $this->assertTrue($this->user->hasRole($role));
     }
-}
\ No newline at end of file
+}

diff --git a/tests/oEmbedTest.php b/tests/oEmbedTest.php
index 1f1d5f826cba25f4899f7a6605d5596d96d9712b..50f3fd29199bbabfb14e63542097104d18bdad8b 100644 (file)
--- a/tests/oEmbedTest.php
+++ b/tests/oEmbedTest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';