forked from GNUsocial/gnu-social
		
	[DB] Make DB::findOneBy throw a different exception if two values are found
This commit is contained in:
		@@ -32,6 +32,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
namespace App\Core\DB;
 | 
					namespace App\Core\DB;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					use App\Util\Exception\DuplicateFoundException;
 | 
				
			||||||
use App\Util\Exception\NotFoundException;
 | 
					use App\Util\Exception\NotFoundException;
 | 
				
			||||||
use App\Util\Formatting;
 | 
					use App\Util\Formatting;
 | 
				
			||||||
use Doctrine\Common\Collections\Criteria;
 | 
					use Doctrine\Common\Collections\Criteria;
 | 
				
			||||||
@@ -163,7 +164,11 @@ abstract class DB
 | 
				
			|||||||
        if (count($res) == 1) {
 | 
					        if (count($res) == 1) {
 | 
				
			||||||
            return $res[0];
 | 
					            return $res[0];
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 | 
					            if (count($res) == 0) {
 | 
				
			||||||
                throw new NotFoundException("No value in table {$table} matches the requested criteria");
 | 
					                throw new NotFoundException("No value in table {$table} matches the requested criteria");
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                throw new DuplicateFoundException("Multiple values in table {$table} match the requested criteria");
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										39
									
								
								src/Util/Exception/DuplicateFoundException.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								src/Util/Exception/DuplicateFoundException.php
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,39 @@
 | 
				
			|||||||
 | 
					<?php
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// {{{ License
 | 
				
			||||||
 | 
					// This file is part of GNU social - https://www.gnu.org/software/social
 | 
				
			||||||
 | 
					//
 | 
				
			||||||
 | 
					// GNU social 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.
 | 
				
			||||||
 | 
					//
 | 
				
			||||||
 | 
					// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
 | 
					// }}}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Duplicate value found in DB when not expected
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @category  Exception
 | 
				
			||||||
 | 
					 * @package   GNUsocial
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @author    Hugo Sales <hugo@hsal.es>
 | 
				
			||||||
 | 
					 * @copyright 2021 Free Software Foundation, Inc http://www.fsf.org
 | 
				
			||||||
 | 
					 * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					namespace App\Util\Exception;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class DuplicateFoundException extends ServerException
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    public function __construct(string $m)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        parent::__construct($m);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user