support oracle

Signed-off-by: Maxence Lange <[email protected]>

composer.json

@@ -22,9 +22,6 @@
       "OCA\\Circles\\": "lib/"
     }
   },
-  "require": {
-    "artificial-owl/my-small-php-tools": "~22"
-  },
   "scripts": {
     "cs:check": "php-cs-fixer fix --dry-run --diff",
     "cs:fix": "php-cs-fixer fix",

lib/AppInfo/Application.php

@@ -92,10 +92,6 @@
 
 //use OCA\Files\App as FilesApp;
 
-
-require_once __DIR__ . '/../../vendor/autoload.php';
-
-
 /**
  * Class Application
  *

lib/CirclesManager.php

@@ -31,7 +31,7 @@
 
 namespace OCA\Circles;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
+use OCA\Circles\Tools\Exceptions\InvalidItemException;
 use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Exceptions\ContactAddressBookNotFoundException;
 use OCA\Circles\Exceptions\ContactFormatException;

lib/Collaboration/v2/CollaboratorSearchPlugin.php

@@ -31,7 +31,7 @@
 
 namespace OCA\Circles\Collaboration\v2;
 
-use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
+use OCA\Circles\Tools\Traits\TNCLogger;
 use Exception;
 use OC\Share20\Share;
 use OCA\Circles\AppInfo\Application;
@@ -51,7 +51,7 @@
  * @package OCA\Circles\Collaboration\v2
  */
 class CollaboratorSearchPlugin implements ISearchPlugin {
-	use TNC22Logger;
+	use TNCLogger;
 
 
 	/** @var IRequest */

lib/Command/CirclesCheck.php

@@ -31,14 +31,6 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
-use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
-use ArtificialOwl\MySmallPhpTools\Model\Request;
-use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
-use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
-use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
-use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
 use Exception;
 use OC;
 use OC\AppConfig;
@@ -63,6 +55,14 @@
 use OCA\Circles\Service\RemoteService;
 use OCA\Circles\Service\RemoteStreamService;
 use OCA\Circles\Service\RemoteUpstreamService;
+use OCA\Circles\Tools\Exceptions\RequestNetworkException;
+use OCA\Circles\Tools\Exceptions\SignatoryException;
+use OCA\Circles\Tools\Model\NCRequest;
+use OCA\Circles\Tools\Model\Request;
+use OCA\Circles\Tools\Model\SimpleDataStore;
+use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Circles\Tools\Traits\TNCRequest;
+use OCA\Circles\Tools\Traits\TStringTools;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -77,7 +77,7 @@
 class CirclesCheck extends Base {
 	use TStringTools;
 	use TArrayTools;
-	use TNC22Request;
+	use TNCRequest;
 
 
 	public static $checks = [
@@ -791,7 +791,7 @@ private function testRequest(
 		string $route,
 		array $args = []
 	): bool {
-		$request = new NC22Request('', Request::type($type));
+		$request = new NCRequest('', Request::type($type));
 		$this->configService->configureLoopbackRequest($request, $route, $args);
 		$request->setFollowLocation(false);
 

lib/Command/CirclesDetails.php

@@ -31,7 +31,7 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
+use OCA\Circles\Tools\Exceptions\InvalidItemException;
 use OC\Core\Command\Base;
 use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Exceptions\FederatedItemException;

lib/Command/CirclesList.php

@@ -31,10 +31,10 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
-use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
-use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
+use OCA\Circles\Tools\Exceptions\RequestNetworkException;
+use OCA\Circles\Tools\Exceptions\SignatoryException;
+use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Circles\Tools\Traits\TStringTools;
 use OC\Core\Command\Base;
 use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Exceptions\FederatedItemException;

lib/Command/CirclesMemberships.php

@@ -31,13 +31,6 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException;
-use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22TreeNode;
-use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
-use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22ConsoleTree;
-use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OC\Core\Command\Base;
 use OCA\Circles\Db\CircleRequest;
@@ -66,6 +59,13 @@
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Service\MembershipService;
+use OCA\Circles\Tools\Exceptions\InvalidItemException;
+use OCA\Circles\Tools\Exceptions\ItemNotFoundException;
+use OCA\Circles\Tools\Exceptions\UnknownTypeException;
+use OCA\Circles\Tools\Model\SimpleDataStore;
+use OCA\Circles\Tools\Model\TreeNode;
+use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Circles\Tools\Traits\TConsoleTree;
 use OCP\IUserManager;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
@@ -81,7 +81,7 @@
  */
 class CirclesMemberships extends Base {
 	use TArrayTools;
-	use TNC22ConsoleTree;
+	use TConsoleTree;
 
 
 	/** @var IUserManager */
@@ -237,7 +237,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$output->writeln('');
 
-		$tree = new NC22TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
+		$tree = new TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
 		$this->generateTree($federatedUser->getSingleId(), $tree);
 
 		$this->drawTree(
@@ -255,10 +255,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 	/**
 	 * @param string $id
-	 * @param NC22TreeNode $tree
+	 * @param TreeNode $tree
 	 * @param array $knownIds
 	 */
-	private function generateTree(string $id, NC22TreeNode $tree, array $knownIds = []) {
+	private function generateTree(string $id, TreeNode $tree, array $knownIds = []) {
 		if (in_array($id, $knownIds)) {
 			return;
 		}
@@ -271,7 +271,7 @@ private function generateTree(string $id, NC22TreeNode $tree, array $knownIds =
 				continue;
 			}
 
-			$item = new NC22TreeNode(
+			$item = new TreeNode(
 				$tree, new SimpleDataStore(
 						 [
 						 	'member' => $member,

lib/Command/CirclesRemote.php

@@ -31,13 +31,13 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException;
-use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
-use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest;
-use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22WellKnown;
-use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
+use OCA\Circles\Tools\Exceptions\RequestNetworkException;
+use OCA\Circles\Tools\Exceptions\SignatoryException;
+use OCA\Circles\Tools\Exceptions\SignatureException;
+use OCA\Circles\Tools\Model\NCRequest;
+use OCA\Circles\Tools\Model\NCSignedRequest;
+use OCA\Circles\Tools\Traits\TNCWellKnown;
+use OCA\Circles\Tools\Traits\TStringTools;
 use Exception;
 use OC\Core\Command\Base;
 use OCA\Circles\AppInfo\Application;
@@ -63,7 +63,7 @@
  * @package OCA\Circles\Command
  */
 class CirclesRemote extends Base {
-	use TNC22WellKnown;
+	use TNCWellKnown;
 	use TStringTools;
 
 
@@ -395,12 +395,12 @@ private function updateRemote(RemoteInstance $remoteSignatory): void {
 	 * @param string $remote
 	 * @param array $payload
 	 *
-	 * @return NC22SignedRequest
+	 * @return NCSignedRequest
 	 * @throws RequestNetworkException
 	 * @throws SignatoryException
 	 */
-	private function outgoingTest(string $remote, array $payload): NC22SignedRequest {
-		$request = new NC22Request();
+	private function outgoingTest(string $remote, array $payload): NCSignedRequest {
+		$request = new NCRequest();
 		$request->basedOnUrl($remote);
 		$request->setFollowLocation(true);
 		$request->setLocalAddressAllowed(true);

lib/Command/CirclesReport.php

@@ -31,12 +31,9 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Console\Nextcloud\nc22\NC22InteractiveShell;
-use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
-use ArtificialOwl\MySmallPhpTools\IInteractiveShellClient;
-use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22InteractiveShellSession;
-use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
-use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
+use OCA\Circles\Tools\Exceptions\InvalidItemException;
+use OCA\Circles\Tools\Traits\TDeserialize;
+use OCA\Circles\Tools\Traits\TArrayTools;
 use OC\Core\Command\Base;
 use OCA\Circles\Exceptions\InitiatorNotFoundException;
 use OCA\Circles\Exceptions\UnknownInterfaceException;
@@ -63,7 +60,7 @@
  * @package OCA\Circles\Command
  */
 class CirclesReport extends Base implements IInteractiveShellClient {
-	use TNC22Deserialize;
+	use TDeserialize;
 	use TArrayTools;
 
 
@@ -136,6 +133,8 @@ protected function configure() {
 	 * @throws InitiatorNotFoundException
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
+		throw new \Exception('not available');
+
 		$filename = $input->getOption('read');
 		$local = $input->getOption('local');
 		$this->output = $output;

lib/Command/CirclesTest.php

@@ -31,11 +31,11 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException;
-use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
-use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
-use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
+use OCA\Circles\Tools\Exceptions\InvalidItemException;
+use OCA\Circles\Tools\Exceptions\ItemNotFoundException;
+use OCA\Circles\Tools\Traits\TDeserialize;
+use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Circles\Tools\Traits\TStringTools;
 use Exception;
 use OC\Core\Command\Base;
 use OCA\Circles\AppInfo\Application;
@@ -63,7 +63,7 @@
 class CirclesTest extends Base {
 	use TArrayTools;
 	use TStringTools;
-	use TNC22Deserialize;
+	use TDeserialize;
 
 
 	public static $INSTANCES = [

lib/Command/MembersAdd.php

@@ -31,13 +31,13 @@
 
 namespace OCA\Circles\Command;
 
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestContentException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultSizeException;
-use ArtificialOwl\MySmallPhpTools\Exceptions\RequestServerException;
-use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
-use ArtificialOwl\MySmallPhpTools\Model\Request;
+use OCA\Circles\Tools\Exceptions\RequestContentException;
+use OCA\Circles\Tools\Exceptions\RequestNetworkException;
+use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException;
+use OCA\Circles\Tools\Exceptions\RequestResultSizeException;
+use OCA\Circles\Tools\Exceptions\RequestServerException;
+use OCA\Circles\Tools\Model\NCRequest;
+use OCA\Circles\Tools\Model\Request;
 use Exception;
 use OC\Core\Command\Base;
 use OCA\Circles\Exceptions\FederatedItemException;
@@ -162,7 +162,7 @@ private function findUserFromLookup(string $search, string &$instance = ''): str
 			return '';
 		}
 
-		$request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
+		$request = new NCRequest(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
 		$this->configService->configureRequest($request);
 		$request->basedOnUrl($lookup);
 		$request->addParam('search', $search);