JeroenDeDauw / TermStore

tests/integration/TestEnvironment.php

Spacing +4 added lines, -4 removed lines

@@ -30,13 +30,13 @@
 	private $factory;
 
 	private function __construct() {
-		$connection = DriverManager::getConnection( array(
+		$connection = DriverManager::getConnection(array(
 				'driver' => 'pdo_sqlite',
 				'memory' => true,
-		) );
+		));
 
-		$config = new TermStoreConfig( 'ts_' );
-		$this->factory = new TermStoreFactory( $connection, $config );
+		$config = new TermStoreConfig('ts_');
+		$this->factory = new TermStoreFactory($connection, $config);
 	}
 
 	public function getFactory() {

tests/integration/TermStoreTest.php

Spacing +80 added lines, -80 removed lines

@@ -29,236 +29,236 @@
 	}
 
 	public function testGivenNotMatchingArgs_getTermByIdAndLanguageReturnsNull() {
-		$this->assertNull( $this->store->getLabelByIdAndLanguage( new ItemId( 'Q1337' ), 'en' ) );
+		$this->assertNull($this->store->getLabelByIdAndLanguage(new ItemId('Q1337'), 'en'));
 	}
 
 	public function testStoreIdAndFingerprint() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'en label' );
-		$fingerprint->setLabel( 'de', 'de label' );
-		$fingerprint->setDescription( 'en', 'en description' );
-		$fingerprint->setAliasGroup( 'en', [ 'first en alias', 'second en alias' ] );
+		$fingerprint->setLabel('en', 'en label');
+		$fingerprint->setLabel('de', 'de label');
+		$fingerprint->setDescription('en', 'en description');
+		$fingerprint->setAliasGroup('en', [ 'first en alias', 'second en alias' ]);
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'en label',
-			$this->store->getLabelByIdAndLanguage( $id, 'en' )
+			$this->store->getLabelByIdAndLanguage($id, 'en')
 		);
 
 		$this->assertSame(
 			'de label',
-			$this->store->getLabelByIdAndLanguage( $id, 'de' )
+			$this->store->getLabelByIdAndLanguage($id, 'de')
 		);
 
 		$this->assertSame(
 			[ 'first en alias', 'second en alias' ],
-			$this->store->getAliasesByIdAndLanguage( $id, 'en' )
+			$this->store->getAliasesByIdAndLanguage($id, 'en')
 		);
 	}
 
 	public function testGetIdByLabelAndLanguage() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'en label' );
-		$fingerprint->setLabel( 'de', 'de label' );
+		$fingerprint->setLabel('en', 'en label');
+		$fingerprint->setLabel('de', 'de label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'Q1337',
-			$this->store->getIdByLabel( 'en', 'en label' )
+			$this->store->getIdByLabel('en', 'en label')
 		);
 	}
 
 	public function testStoreFingerprintRemovesOldData() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'en label' );
-		$fingerprint->setLabel( 'de', 'de label' );
-		$fingerprint->setAliasGroup( 'en', [ 'first en alias', 'second en alias' ] );
+		$fingerprint->setLabel('en', 'en label');
+		$fingerprint->setLabel('de', 'de label');
+		$fingerprint->setAliasGroup('en', [ 'first en alias', 'second en alias' ]);
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'de', 'new de label' );
+		$fingerprint->setLabel('de', 'new de label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertEquals(
 			'new de label',
-			$this->store->getLabelByIdAndLanguage( $id, 'de' )
+			$this->store->getLabelByIdAndLanguage($id, 'de')
 		);
 
-		$this->assertNull( $this->store->getLabelByIdAndLanguage( $id, 'en' ) );
-		$this->assertEmpty( $this->store->getAliasesByIdAndLanguage( $id, 'en' ) );
+		$this->assertNull($this->store->getLabelByIdAndLanguage($id, 'en'));
+		$this->assertEmpty($this->store->getAliasesByIdAndLanguage($id, 'en'));
 	}
 
 	public function testGivenNonMatchingArgs_getAliasesReturnsEmptyArray() {
-		$this->assertSame( [], $this->store->getAliasesByIdAndLanguage( new ItemId( 'Q1337' ), 'en' ) );
+		$this->assertSame([ ], $this->store->getAliasesByIdAndLanguage(new ItemId('Q1337'), 'en'));
 	}
 
 	public function testGetIdByTextReturnsMatchBasedOnLabel() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'kittens' );
-		$fingerprint->setAliasGroup( 'en', [ 'first en alias', 'second en alias' ] );
+		$fingerprint->setLabel('en', 'kittens');
+		$fingerprint->setAliasGroup('en', [ 'first en alias', 'second en alias' ]);
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
-		$id = new ItemId( 'Q42' );
+		$id = new ItemId('Q42');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'foobar' );
-		$fingerprint->setAliasGroup( 'en', [ 'kittens', 'first en alias' ] );
+		$fingerprint->setLabel('en', 'foobar');
+		$fingerprint->setAliasGroup('en', [ 'kittens', 'first en alias' ]);
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'Q1337',
-			$this->store->getIdByText( 'en', 'kittens' )
+			$this->store->getIdByText('en', 'kittens')
 		);
 	}
 
 	public function testGetIdByTextReturnsAliasBasedMatchIfNoLabelsMatch() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'foobar' );
-		$fingerprint->setAliasGroup( 'en', [ 'first en alias', 'second en alias' ] );
+		$fingerprint->setLabel('en', 'foobar');
+		$fingerprint->setAliasGroup('en', [ 'first en alias', 'second en alias' ]);
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
-		$id = new ItemId( 'Q42' );
+		$id = new ItemId('Q42');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'foobar' );
-		$fingerprint->setAliasGroup( 'en', [ 'kittens', 'first en alias' ] );
+		$fingerprint->setLabel('en', 'foobar');
+		$fingerprint->setAliasGroup('en', [ 'kittens', 'first en alias' ]);
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'Q42',
-			$this->store->getIdByText( 'en', 'kittens' )
+			$this->store->getIdByText('en', 'kittens')
 		);
 	}
 
 	public function testByLabelLookupIsCaseInsensitive() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'EN label' );
+		$fingerprint->setLabel('en', 'EN label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'Q1337',
-			$this->store->getIdByLabel( 'en', 'en LABEL' )
+			$this->store->getIdByLabel('en', 'en LABEL')
 		);
 	}
 
 	public function testGetItemIdByLabelReturnsNoPropertyIds() {
-		$id = new PropertyId( 'P1337' );
+		$id = new PropertyId('P1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
-		$this->assertNull( $this->store->getItemIdByLabel( 'en', 'some label' ) );
+		$this->assertNull($this->store->getItemIdByLabel('en', 'some label'));
 	}
 
 	public function testGetPropertyIdByLabelReturnsNoItemIds() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
-		$this->assertNull( $this->store->getPropertyIdByLabel( 'en', 'some label' ) );
+		$this->assertNull($this->store->getPropertyIdByLabel('en', 'some label'));
 	}
 
 	public function testGetItemIdByLabelReturnsItemIds() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'Q1337',
-			$this->store->getItemIdByLabel( 'en', 'some label' )
+			$this->store->getItemIdByLabel('en', 'some label')
 		);
 	}
 
 	public function testGetPropertyIdByLabelReturnsPropertyIds() {
-		$id = new PropertyId( 'P1337' );
+		$id = new PropertyId('P1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'P1337',
-			$this->store->getPropertyIdByLabel( 'en', 'some label' )
+			$this->store->getPropertyIdByLabel('en', 'some label')
 		);
 	}
 
 	public function testGetItemIdByTextReturnsNoPropertyIds() {
-		$id = new PropertyId( 'P1337' );
+		$id = new PropertyId('P1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
-		$this->assertNull( $this->store->getItemIdByText( 'en', 'some label' ) );
+		$this->assertNull($this->store->getItemIdByText('en', 'some label'));
 	}
 
 	public function testGetPropertyIdByTextReturnsNoItemIds() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
-		$this->assertNull( $this->store->getPropertyIdByText( 'en', 'some label' ) );
+		$this->assertNull($this->store->getPropertyIdByText('en', 'some label'));
 	}
 
 	public function testGetItemIdByTextReturnsItemIds() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'Q1337',
-			$this->store->getItemIdByText( 'en', 'some label' )
+			$this->store->getItemIdByText('en', 'some label')
 		);
 	}
 
 	public function testGetPropertyIdByTextReturnsPropertyIds() {
-		$id = new PropertyId( 'P1337' );
+		$id = new PropertyId('P1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'some label' );
+		$fingerprint->setLabel('en', 'some label');
 
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 
 		$this->assertSame(
 			'P1337',
-			$this->store->getPropertyIdByText( 'en', 'some label' )
+			$this->store->getPropertyIdByText('en', 'some label')
 		);
 	}
 

tests/bootstrap.php

Spacing +9 added lines, -9 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
-	die( 'Not an entry point' );
+if (PHP_SAPI !== 'cli') {
+	die('Not an entry point');
 }
 
-error_reporting( E_ALL | E_STRICT );
-ini_set( 'display_errors', 1 );
+error_reporting(E_ALL | E_STRICT);
+ini_set('display_errors', 1);
 
-if ( !is_readable( __DIR__ . '/../vendor/autoload.php' ) ) {
-	die( 'You need to install this package with Composer before you can run the tests' );
+if (!is_readable(__DIR__.'/../vendor/autoload.php')) {
+	die('You need to install this package with Composer before you can run the tests');
 }
 
-$autoLoader = require __DIR__ . '/../vendor/autoload.php';
+$autoLoader = require __DIR__.'/../vendor/autoload.php';
 
-$autoLoader->addPsr4( 'Tests\\Queryr\\TermStore\\', __DIR__ . '/integration' );
+$autoLoader->addPsr4('Tests\\Queryr\\TermStore\\', __DIR__.'/integration');
 
-unset( $autoLoader );
\ No newline at end of file
+unset($autoLoader);
\ No newline at end of file

src/TableQueryExecutor.php

Spacing +28 added lines, -28 removed lines

@@ -15,70 +15,70 @@
 	private $connection;
 	private $tableName;
 
-	public function __construct( Connection $connection, $tableName ) {
+	public function __construct(Connection $connection, $tableName) {
 		$this->connection = $connection;
 		$this->tableName = $tableName;
 	}
 
-	public function selectOneField( $fieldName, array $conditions = [] ) {
-		return $this->selectOne( [ $fieldName ], $conditions )[$fieldName];
+	public function selectOneField($fieldName, array $conditions = [ ]) {
+		return $this->selectOne([ $fieldName ], $conditions)[ $fieldName ];
 	}
 
-	public function selectOne( array $fieldNames = null, array $conditions = [] ) {
-		$statement = $this->executeSelect( $fieldNames, $conditions, 1 );
+	public function selectOne(array $fieldNames = null, array $conditions = [ ]) {
+		$statement = $this->executeSelect($fieldNames, $conditions, 1);
 
 		$result = $statement->fetch();
 		return $result === false ? null : $result;
 	}
 
-	public function select( array $fieldNames = null, array $conditions = [] ) {
-		$statement = $this->executeSelect( $fieldNames, $conditions );
+	public function select(array $fieldNames = null, array $conditions = [ ]) {
+		$statement = $this->executeSelect($fieldNames, $conditions);
 		return $statement->fetchAll();
 	}
 
-	public function selectField( $fieldName, array $conditions = [] ) {
+	public function selectField($fieldName, array $conditions = [ ]) {
 		return array_map(
-			function( array $resultRow ) use ( $fieldName ) {
-				return $resultRow[$fieldName];
+			function(array $resultRow) use ($fieldName) {
+				return $resultRow[ $fieldName ];
 			},
-			$this->select( [ $fieldName ], $conditions )
+			$this->select([ $fieldName ], $conditions)
 		);
 	}
 
-	private function executeSelect( array $fieldNames = null, array $conditions = [], $limit = null ) {
-		$sql = $this->buildSelectSql( $fieldNames, $conditions, $limit );
+	private function executeSelect(array $fieldNames = null, array $conditions = [ ], $limit = null) {
+		$sql = $this->buildSelectSql($fieldNames, $conditions, $limit);
 
-		$statement = $this->connection->prepare( $sql );
-		$statement->execute( array_values( $conditions ) );
+		$statement = $this->connection->prepare($sql);
+		$statement->execute(array_values($conditions));
 
 		return $statement;
 	}
 
-	private function buildSelectSql( array $fieldNames = null, array $conditions = [], $limit = null ) {
-		$fieldSql = $this->getFieldSql( $fieldNames );
-		$conditionSql = $this->getConditionSql( $conditions );
+	private function buildSelectSql(array $fieldNames = null, array $conditions = [ ], $limit = null) {
+		$fieldSql = $this->getFieldSql($fieldNames);
+		$conditionSql = $this->getConditionSql($conditions);
 
-		$sql = 'SELECT ' . $fieldSql . ' FROM ' . $this->tableName . ' WHERE ' . $conditionSql;
+		$sql = 'SELECT '.$fieldSql.' FROM '.$this->tableName.' WHERE '.$conditionSql;
 
-		if ( $limit !== null ) {
-			$sql .= ' LIMIT ' . (int)$limit;
+		if ($limit !== null) {
+			$sql .= ' LIMIT '.(int)$limit;
 		}
 
 		return $sql;
 	}
 
-	private function getFieldSql( array $fields = null ) {
-		return $fields === null || $fields === [] ? '*' : implode( ', ', (array)$fields );
+	private function getFieldSql(array $fields = null) {
+		return $fields === null || $fields === [ ] ? '*' : implode(', ', (array)$fields);
 	}
 
-	private function getConditionSql( array $conditions ) {
-		$wherePredicates = [];
+	private function getConditionSql(array $conditions) {
+		$wherePredicates = [ ];
 
-		foreach ( $conditions as $columnName => $columnValue ) {
-			$wherePredicates[] = $columnName . ' = ?';
+		foreach ($conditions as $columnName => $columnValue) {
+			$wherePredicates[ ] = $columnName.' = ?';
 		}
 
-		return implode( ' AND ', $wherePredicates );
+		return implode(' AND ', $wherePredicates);
 	}
 
 }

src/TermStore.php

Braces +2 added lines, -4 removed lines

@@ -65,8 +65,7 @@ 
 					'language' => $languageCode
 				]
 			);
-		}
-		catch ( DBALException $ex ) {
+		} catch ( DBALException $ex ) {
 			throw new TermStoreException( $ex->getMessage(), $ex );
 		}
 	}
@@ -87,8 +86,7 @@ 
 					'language' => $languageCode
 				]
 			);
-		}
-		catch ( DBALException $ex ) {
+		} catch ( DBALException $ex ) {
 			throw new TermStoreException( $ex->getMessage(), $ex );
 		}
 	}

Spacing +27 added lines, -27 removed lines

@@ -22,12 +22,12 @@ 
 	private $labelTable;
 	private $aliasesTable;
 
-	public function __construct( Connection $connection, TermStoreConfig $config ) {
-		$this->labelTable = new TableQueryExecutor( $connection, $config->getLabelTableName() );
-		$this->aliasesTable = new TableQueryExecutor( $connection, $config->getAliasesTableName() );
+	public function __construct(Connection $connection, TermStoreConfig $config) {
+		$this->labelTable = new TableQueryExecutor($connection, $config->getLabelTableName());
+		$this->aliasesTable = new TableQueryExecutor($connection, $config->getAliasesTableName());
 
-		$this->storeWriter = new TermStoreWriter( $connection, $config );
-		$this->idLookup = new IdLookup( $this->labelTable, $this->aliasesTable );
+		$this->storeWriter = new TermStoreWriter($connection, $config);
+		$this->idLookup = new IdLookup($this->labelTable, $this->aliasesTable);
 	}
 
 	/**
@@ -36,8 +36,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function storeEntityFingerprint( EntityId $id, Fingerprint $fingerprint ) {
-		$this->storeWriter->storeEntityFingerprint( $id, $fingerprint );
+	public function storeEntityFingerprint(EntityId $id, Fingerprint $fingerprint) {
+		$this->storeWriter->storeEntityFingerprint($id, $fingerprint);
 	}
 
 	/**
@@ -45,14 +45,14 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function dropTermsForId( EntityId $id ) {
-		$this->storeWriter->dropTermsForId( $id );
+	public function dropTermsForId(EntityId $id) {
+		$this->storeWriter->dropTermsForId($id);
 	}
 
 	/**
 	 * @throws TermStoreException
 	 */
-	public function getLabelByIdAndLanguage( EntityId $id, string $languageCode ): ?string {
+	public function getLabelByIdAndLanguage(EntityId $id, string $languageCode): ?string {
 		try {
 			return $this->labelTable->selectOneField(
 				'text',
@@ -62,8 +62,8 @@ 
 				]
 			);
 		}
-		catch ( DBALException $ex ) {
-			throw new TermStoreException( $ex->getMessage(), $ex );
+		catch (DBALException $ex) {
+			throw new TermStoreException($ex->getMessage(), $ex);
 		}
 	}
 
@@ -74,7 +74,7 @@ 
 	 * @return string[]
 	 * @throws TermStoreException
 	 */
-	public function getAliasesByIdAndLanguage( EntityId $id, string $languageCode ): array {
+	public function getAliasesByIdAndLanguage(EntityId $id, string $languageCode): array {
 		try {
 			return $this->aliasesTable->selectField(
 				'text',
@@ -84,8 +84,8 @@ 
 				]
 			);
 		}
-		catch ( DBALException $ex ) {
-			throw new TermStoreException( $ex->getMessage(), $ex );
+		catch (DBALException $ex) {
+			throw new TermStoreException($ex->getMessage(), $ex);
 		}
 	}
 
@@ -94,8 +94,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getIdByLabel( string $labelLanguageCode, string $labelText ): ?string {
-		return $this->idLookup->getIdByLabel( $labelLanguageCode, $labelText );
+	public function getIdByLabel(string $labelLanguageCode, string $labelText): ?string {
+		return $this->idLookup->getIdByLabel($labelLanguageCode, $labelText);
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getItemIdByLabel( string $labelLanguageCode, string $labelText ): ?string {
-		return $this->idLookup->getItemIdByLabel( $labelLanguageCode, $labelText );
+	public function getItemIdByLabel(string $labelLanguageCode, string $labelText): ?string {
+		return $this->idLookup->getItemIdByLabel($labelLanguageCode, $labelText);
 	}
 
 	/**
@@ -112,8 +112,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getPropertyIdByLabel( string $labelLanguageCode, string $labelText ): ?string {
-		return $this->idLookup->getPropertyIdByLabel( $labelLanguageCode, $labelText );
+	public function getPropertyIdByLabel(string $labelLanguageCode, string $labelText): ?string {
+		return $this->idLookup->getPropertyIdByLabel($labelLanguageCode, $labelText);
 	}
 
 	/**
@@ -121,8 +121,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getIdByText( string $languageCode, string $termText ): ?string {
-		return $this->idLookup->getIdByText( $languageCode, $termText );
+	public function getIdByText(string $languageCode, string $termText): ?string {
+		return $this->idLookup->getIdByText($languageCode, $termText);
 	}
 
 	/**
@@ -130,8 +130,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getItemIdByText( string $languageCode, string $termText ): ?string {
-		return $this->idLookup->getItemIdByText( $languageCode, $termText );
+	public function getItemIdByText(string $languageCode, string $termText): ?string {
+		return $this->idLookup->getItemIdByText($languageCode, $termText);
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getPropertyIdByText( string $languageCode, string $termText ): ?string {
-		return $this->idLookup->getPropertyIdByText( $languageCode, $termText );
+	public function getPropertyIdByText(string $languageCode, string $termText): ?string {
+		return $this->idLookup->getPropertyIdByText($languageCode, $termText);
 	}
 
 }

src/TermStoreWriter.php

Braces +2 added lines, -4 removed lines

@@ -39,8 +39,7 @@ 
 
 		try {
 			$this->storeFingerprintParts( $id, $fingerprint );
-		}
-		catch ( DBALException $ex ) {
+		} catch ( DBALException $ex ) {
 			$this->connection->rollBack();
 			throw new TermStoreException( $ex->getMessage(), $ex );
 		}
@@ -80,8 +79,7 @@ 
 				$this->config->getAliasesTableName(),
 				[ 'entity_id' => $id->getSerialization() ]
 			);
-		}
-		catch ( DBALException $ex ) {
+		} catch ( DBALException $ex ) {
 			throw new TermStoreException( $ex->getMessage(), $ex );
 		}
 	}

Spacing +19 added lines, -19 removed lines

@@ -21,7 +21,7 @@ 
 	private $connection;
 	private $config;
 
-	public function __construct( Connection $connection, TermStoreConfig $config ) {
+	public function __construct(Connection $connection, TermStoreConfig $config) {
 		$this->connection = $connection;
 		$this->config = $config;
 	}
@@ -32,17 +32,17 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function storeEntityFingerprint( EntityId $id, Fingerprint $fingerprint ): void {
+	public function storeEntityFingerprint(EntityId $id, Fingerprint $fingerprint): void {
 		$this->connection->beginTransaction();
 
-		$this->dropTermsForId( $id );
+		$this->dropTermsForId($id);
 
 		try {
-			$this->storeFingerprintParts( $id, $fingerprint );
+			$this->storeFingerprintParts($id, $fingerprint);
 		}
-		catch ( DBALException $ex ) {
+		catch (DBALException $ex) {
 			$this->connection->rollBack();
-			throw new TermStoreException( $ex->getMessage(), $ex );
+			throw new TermStoreException($ex->getMessage(), $ex);
 		}
 
 		$this->connection->commit();
@@ -51,19 +51,19 @@ 
 	/**
 	 * @throws DBALException
 	 */
-	private function storeFingerprintParts( EntityId $id, Fingerprint $fingerprint ) {
+	private function storeFingerprintParts(EntityId $id, Fingerprint $fingerprint) {
 		/**
 		 * @var Term $label
 		 */
-		foreach ( $fingerprint->getLabels() as $label ) {
-			$this->storeLabel( $label->getLanguageCode(), $label->getText(), $id );
+		foreach ($fingerprint->getLabels() as $label) {
+			$this->storeLabel($label->getLanguageCode(), $label->getText(), $id);
 		}
 
 		/**
 		 * @var AliasGroup $aliasGroup
 		 */
-		foreach ( $fingerprint->getAliasGroups() as $aliasGroup ) {
-			$this->storeAliases( $aliasGroup, $id );
+		foreach ($fingerprint->getAliasGroups() as $aliasGroup) {
+			$this->storeAliases($aliasGroup, $id);
 		}
 	}
 
@@ -72,7 +72,7 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function dropTermsForId( EntityId $id ): void {
+	public function dropTermsForId(EntityId $id): void {
 		try {
 			$this->connection->delete(
 				$this->config->getLabelTableName(),
@@ -84,20 +84,20 @@ 
 				[ 'entity_id' => $id->getSerialization() ]
 			);
 		}
-		catch ( DBALException $ex ) {
-			throw new TermStoreException( $ex->getMessage(), $ex );
+		catch (DBALException $ex) {
+			throw new TermStoreException($ex->getMessage(), $ex);
 		}
 	}
 
 	/**
 	 * @throws DBALException
 	 */
-	private function storeLabel( string $languageCode, string $text, EntityId $id ) {
+	private function storeLabel(string $languageCode, string $text, EntityId $id) {
 		$this->connection->insert(
 			$this->config->getLabelTableName(),
 			[
 				'text' => $text,
-				'text_lowercase' => strtolower( $text ),
+				'text_lowercase' => strtolower($text),
 				'language' => $languageCode,
 				'entity_id' => $id->getSerialization(),
 				'entity_type' => $id->getEntityType()
@@ -108,13 +108,13 @@ 
 	/**
 	 * @throws DBALException
 	 */
-	private function storeAliases( AliasGroup $aliasGroup, EntityId $id ) {
-		foreach ( $aliasGroup->getAliases() as $alias ) {
+	private function storeAliases(AliasGroup $aliasGroup, EntityId $id) {
+		foreach ($aliasGroup->getAliases() as $alias) {
 			$this->connection->insert(
 				$this->config->getAliasesTableName(),
 				[
 					'text' => $alias,
-					'text_lowercase' => strtolower( $alias ),
+					'text_lowercase' => strtolower($alias),
 					'language' => $aliasGroup->getLanguageCode(),
 					'entity_id' => $id->getSerialization(),
 					'entity_type' => $id->getEntityType()

src/IdLookup.php

Braces +2 added lines, -4 removed lines

@@ -82,8 +82,7 @@ 
 				'entity_id',
 				$conditions
 			);
-		}
-		catch ( DBALException $ex ) {
+		} catch ( DBALException $ex ) {
 			throw new TermStoreException( $ex->getMessage(), $ex );
 		}
 	}
@@ -168,8 +167,7 @@ 
 				'entity_id',
 				$conditions
 			);
-		}
-		catch ( DBALException $ex ) {
+		} catch ( DBALException $ex ) {
 			throw new TermStoreException( $ex->getMessage(), $ex );
 		}
 	}

Spacing +29 added lines, -29 removed lines

@@ -15,7 +15,7 @@ 
 	private $labelTable;
 	private $aliasesTable;
 
-	public function __construct( TableQueryExecutor $labelTable, TableQueryExecutor $aliasesTable ) {
+	public function __construct(TableQueryExecutor $labelTable, TableQueryExecutor $aliasesTable) {
 		$this->labelTable = $labelTable;
 		$this->aliasesTable = $aliasesTable;
 	}
@@ -25,8 +25,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getIdByLabel( string $labelLanguageCode, string $labelText ): ?string {
-		return $this->getEntityIdByLabel( $labelLanguageCode, $labelText );
+	public function getIdByLabel(string $labelLanguageCode, string $labelText): ?string {
+		return $this->getEntityIdByLabel($labelLanguageCode, $labelText);
 	}
 
 	/**
@@ -34,8 +34,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getItemIdByLabel( string $labelLanguageCode, string $labelText ): ?string {
-		return $this->getEntityIdByLabel( $labelLanguageCode, $labelText, 'item' );
+	public function getItemIdByLabel(string $labelLanguageCode, string $labelText): ?string {
+		return $this->getEntityIdByLabel($labelLanguageCode, $labelText, 'item');
 	}
 
 	/**
@@ -43,8 +43,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getPropertyIdByLabel( string $labelLanguageCode, string $labelText ): ?string {
-		return $this->getEntityIdByLabel( $labelLanguageCode, $labelText, 'property' );
+	public function getPropertyIdByLabel(string $labelLanguageCode, string $labelText): ?string {
+		return $this->getEntityIdByLabel($labelLanguageCode, $labelText, 'property');
 	}
 
 	/**
@@ -55,14 +55,14 @@ 
 	 * @return string|null
 	 * @throws TermStoreException
 	 */
-	private function getEntityIdByLabel( $labelLanguageCode, $labelText, $entityTypeFilter = null ) {
+	private function getEntityIdByLabel($labelLanguageCode, $labelText, $entityTypeFilter = null) {
 		$conditions = [
-			'text_lowercase' => strtolower( $labelText ),
+			'text_lowercase' => strtolower($labelText),
 			'language' => $labelLanguageCode,
 		];
 
-		if ( $entityTypeFilter !== null ) {
-			$conditions['entity_type'] = $entityTypeFilter;
+		if ($entityTypeFilter !== null) {
+			$conditions[ 'entity_type' ] = $entityTypeFilter;
 		}
 
 		try {
@@ -71,8 +71,8 @@ 
 				$conditions
 			);
 		}
-		catch ( DBALException $ex ) {
-			throw new TermStoreException( $ex->getMessage(), $ex );
+		catch (DBALException $ex) {
+			throw new TermStoreException($ex->getMessage(), $ex);
 		}
 	}
 
@@ -81,8 +81,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getIdByText( string $languageCode, string $termText ): ?string {
-		return $this->getEntityIdByText( $languageCode, $termText );
+	public function getIdByText(string $languageCode, string $termText): ?string {
+		return $this->getEntityIdByText($languageCode, $termText);
 	}
 
 	/**
@@ -90,8 +90,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getItemIdByText( string $languageCode, string $termText ): ?string {
-		return $this->getEntityIdByText( $languageCode, $termText, 'item' );
+	public function getItemIdByText(string $languageCode, string $termText): ?string {
+		return $this->getEntityIdByText($languageCode, $termText, 'item');
 	}
 
 	/**
@@ -99,8 +99,8 @@ 
 	 *
 	 * @throws TermStoreException
 	 */
-	public function getPropertyIdByText( string $languageCode, string $termText ): ?string {
-		return $this->getEntityIdByText( $languageCode, $termText, 'property' );
+	public function getPropertyIdByText(string $languageCode, string $termText): ?string {
+		return $this->getEntityIdByText($languageCode, $termText, 'property');
 	}
 
 	/**
@@ -111,14 +111,14 @@ 
 	 * @return string|null
 	 * @throws TermStoreException
 	 */
-	private function getEntityIdByText( string $languageCode, string $termText, $entityTypeFilter = null ) {
-		$labelMatch = $this->getEntityIdByLabel( $languageCode, $termText, $entityTypeFilter );
+	private function getEntityIdByText(string $languageCode, string $termText, $entityTypeFilter = null) {
+		$labelMatch = $this->getEntityIdByLabel($languageCode, $termText, $entityTypeFilter);
 
-		if ( $labelMatch !== null ) {
+		if ($labelMatch !== null) {
 			return $labelMatch;
 		}
 
-		return $this->getIdByAlias( $languageCode, $termText, $entityTypeFilter );
+		return $this->getIdByAlias($languageCode, $termText, $entityTypeFilter);
 	}
 
 	/**
@@ -129,14 +129,14 @@ 
 	 * @return string|null
 	 * @throws TermStoreException
 	 */
-	private function getIdByAlias( string $aliasLanguageCode, string $aliasText, $entityTypeFilter = null ) {
+	private function getIdByAlias(string $aliasLanguageCode, string $aliasText, $entityTypeFilter = null) {
 		$conditions = [
-			'text_lowercase' => strtolower( $aliasText ),
+			'text_lowercase' => strtolower($aliasText),
 			'language' => $aliasLanguageCode
 		];
 
-		if ( $entityTypeFilter !== null ) {
-			$conditions['entity_type'] = $entityTypeFilter;
+		if ($entityTypeFilter !== null) {
+			$conditions[ 'entity_type' ] = $entityTypeFilter;
 		}
 
 		try {
@@ -145,8 +145,8 @@ 
 				$conditions
 			);
 		}
-		catch ( DBALException $ex ) {
-			throw new TermStoreException( $ex->getMessage(), $ex );
+		catch (DBALException $ex) {
+			throw new TermStoreException($ex->getMessage(), $ex);
 		}
 	}
 

tests/integration/TermStoreWriterTest.php

Spacing +4 added lines, -4 removed lines

@@ -28,15 +28,15 @@
 	public function testWhenNoConnection_storeEntityFingerprintThrowsException() {
 		$writer = TestEnvironment::newInstanceWithoutTables()->getFactory()->newTermStoreWriter();
 
-		$this->expectException( TermStoreException::class );
-		$writer->storeEntityFingerprint( new ItemId( 'Q1' ), new Fingerprint() );
+		$this->expectException(TermStoreException::class);
+		$writer->storeEntityFingerprint(new ItemId('Q1'), new Fingerprint());
 	}
 
 	public function testWhenNoConnection_dropTermsForIdThrowsException() {
 		$writer = TestEnvironment::newInstanceWithoutTables()->getFactory()->newTermStoreWriter();
 
-		$this->expectException( TermStoreException::class );
-		$writer->dropTermsForId( new ItemId( 'Q1' ) );
+		$this->expectException(TermStoreException::class);
+		$writer->dropTermsForId(new ItemId('Q1'));
 	}
 
 }

tests/integration/TermStoreExceptionTest.php

Spacing +7 added lines, -7 removed lines

@@ -24,22 +24,22 @@
 	private $store;
 
 	public function setUp() {
-		$connection = DriverManager::getConnection( array(
+		$connection = DriverManager::getConnection(array(
 			'driver' => 'pdo_sqlite',
 			'memory' => true,
-		) );
+		));
 
-		$this->store = new TermStore( $connection, new TermStoreConfig( '' ) );
+		$this->store = new TermStore($connection, new TermStoreConfig(''));
 	}
 
 	public function testInsertWhenStoreNotInstalledCausesTermStoreException() {
-		$id = new ItemId( 'Q1337' );
+		$id = new ItemId('Q1337');
 
 		$fingerprint = new Fingerprint();
-		$fingerprint->setLabel( 'en', 'EN label' );
+		$fingerprint->setLabel('en', 'EN label');
 
-		$this->expectException( TermStoreException::class );
-		$this->store->storeEntityFingerprint( $id, $fingerprint );
+		$this->expectException(TermStoreException::class);
+		$this->store->storeEntityFingerprint($id, $fingerprint);
 	}
 
 }