s/EmptyIdException/EmptyPkeyValueException/

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 09663ac7c2595b2220783fa14135d9c612332e36..f2c70f5452c9d64d7e1f811ff4d7dca4b3c10a29 100644 (file)
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -174,7 +174,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             foreach (array_unique($matches[0]) as $match) {
                 try {
                     $this->media_ids[$match] = File::getByID($match);
-                } catch (EmptyIdException $e) {
+                } catch (EmptyPkeyValueException $e) {
                     // got a zero from the client, at least Twidere does this on occasion
                 } catch (NoResultException $e) {
                     // File ID was not found. Do we abort and report to the client?

diff --git a/classes/File.php b/classes/File.php
index 1a38aefa7243d5e78aae5c3396197c7b1901e15b..b28f1373d687e92949cb3eb658e9b58e5c96e3aa 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -120,7 +120,7 @@ class File extends Managed_DataObject
                         // $args['attachment'] should always be set if action===attachment, given our routing rules
                         $file = File::getByID($args['attachment']);
                         return $file;
-                    } catch (EmptyIdException $e) {
+                    } catch (EmptyPkeyValueException $e) {
                         // ...but $args['attachment'] can also be 0...
                     } catch (NoResultException $e) {
                         // apparently this link goes to us, but is _not_ an existing attachment (File) ID?

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 5b22672d7b9c285e49a6b3c6a36253998c8f573f..89263ee778439ed77d93b58cb62b67af4a54e4ae 100644 (file)
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -384,7 +384,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
     static function getByID($id)
     {
         if (empty($id)) {
-            throw new EmptyIdException(get_called_class());
+            throw new EmptyPkeyValueException(get_called_class(), 'id');
         }
         // getByPK throws exception if id is null
         // or if the class does not have a single 'id' column as primary key

diff --git a/classes/Notice.php b/classes/Notice.php
index c130cccc268c1277baf023542d4ac13fbd2224f7..96f4769af2cb5bfe91f51eae2dcd485ce5c02e75 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -2683,7 +2683,7 @@ class Notice extends Managed_DataObject
     public static function getAsTimestamp($id)
     {
         if (empty($id)) {
-            throw new EmptyIdException('Notice');
+            throw new EmptyPkeyValueException('Notice', 'id');
         }
 
         $timestamp = null;

diff --git a/lib/emptyidexception.php b/lib/emptyidexception.php
deleted file mode 100644 (file)
index ddf781b..0000000
--- a/lib/emptyidexception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Class for an exception when a database lookup returns no results
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Exception
- * @package   GNUsocial
- * @author    Mikael Nordfeldth <mmn@hethane.se>
- * @copyright 2013 Free Software Foundation, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
- * @link      http://www.gnu.org/software/social/
- */
-
-if (!defined('GNUSOCIAL')) { exit(1); }
-
-class EmptyIdException extends ServerException
-{
-    public function __construct($called_class)
-    {
-        parent::__construct(sprintf(_('Empty ID value was given to query for a "%s" object'), $called_class));
-    }
-}

diff --git a/lib/emptypkeyvalueexception.php b/lib/emptypkeyvalueexception.php
new file mode 100644 (file)
index 0000000..4470b7b
--- /dev/null
+++ b/lib/emptypkeyvalueexception.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Class for an exception when a database lookup returns no results
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Exception
+ * @package   GNUsocial
+ * @author    Mikael Nordfeldth <mmn@hethane.se>
+ * @copyright 2013 Free Software Foundation, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://www.gnu.org/software/social/
+ */
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class EmptyPkeyValueException extends ServerException
+{
+    public function __construct($called_class, $key=null)
+    {
+        // FIXME: translate the 'not specified' case?
+        parent::__construct(sprintf(_('Empty primary key (%1$s) value was given to query for a "%2$s" object'),
+                                        is_null($key) ? 'not specified' : _ve($key),
+                                        $called_class));
+    }
+}

diff --git a/plugins/Favorite/classes/Fave.php b/plugins/Favorite/classes/Fave.php
index c9bb7a6dd27fa9284ff99dabc6ad17e33d094628..fb5575c0d4fb89fe7dd41f06f35279d249408454 100644 (file)
--- a/plugins/Favorite/classes/Fave.php
+++ b/plugins/Favorite/classes/Fave.php
@@ -132,7 +132,7 @@ class Fave extends Managed_DataObject
         } catch (NoResultException $e) {
             // In case there's some inconsistency where the profile or notice was deleted without losing the fave db entry
             common_log(LOG_INFO, '"'.get_class($e->obj).'" with id=='.var_export($e->obj->id, true).' object not found when deleting favorite, ignoring...');
-        } catch (EmptyIdException $e) {
+        } catch (EmptyPkeyValueException $e) {
             // Some buggy instances of GNU social have had favorites with notice id==0 stored in the database
             common_log(LOG_INFO, _ve($e->getMessage()));
         }