Skip to content

Commit 4647614

Browse files
author
Mark Baker
authored
Remove redundant autoloader code, and adjust namespacing for unit tests (#7)
1 parent d490920 commit 4647614

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+131
-182
lines changed

‎.phpcs.xml.dist

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
<?xml version="1.0"?>
2-
<ruleset name="PHPMatrix">
2+
<ruleset
3+
name="PHPMatrix"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd"
6+
>
37
<description>The code standard for PHPMatrix is PSR2.</description>
48

9+
<!-- ##### Coding Standard check #####-->
10+
<rule ref="PSR2"/>
11+
512
<!--
613
#############################################################################
714
COMMAND LINE ARGUMENTS
@@ -34,13 +41,8 @@
3441
-->
3542

3643
<!-- ##### Check PHP cross-version compatibility ##### -->
37-
<config name="testVersion" value="5.6-"/>
3844
<rule ref="PHPCompatibility"/>
39-
40-
41-
<!-- ##### Coding Standard check #####-->
42-
<rule ref="PSR2"/>
43-
45+
<config name="testVersion" value="5.6"/>
4446

4547
<!--
4648
#############################################################################

‎classes/Autoloader.php

-53
This file was deleted.

‎classes/Bootstrap.php

-38
This file was deleted.

‎classes/src/functions/adjoint.php ‎classes/src/Functions/adjoint.php

File renamed without changes.

‎classes/src/functions/antidiagonal.php ‎classes/src/Functions/antidiagonal.php

File renamed without changes.

‎classes/src/functions/cofactors.php ‎classes/src/Functions/cofactors.php

File renamed without changes.

‎classes/src/functions/determinant.php ‎classes/src/Functions/determinant.php

File renamed without changes.

‎classes/src/functions/diagonal.php ‎classes/src/Functions/diagonal.php

File renamed without changes.

‎classes/src/functions/identity.php ‎classes/src/Functions/identity.php

File renamed without changes.

‎classes/src/functions/inverse.php ‎classes/src/Functions/inverse.php

File renamed without changes.

‎classes/src/functions/minors.php ‎classes/src/Functions/minors.php

File renamed without changes.

‎classes/src/functions/trace.php ‎classes/src/Functions/trace.php

File renamed without changes.

‎classes/src/functions/transpose.php ‎classes/src/Functions/transpose.php

File renamed without changes.

‎classes/src/Matrix.php

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* @method Matrix multiply(...$matrices)
3434
* @method Matrix divideby(...$matrices)
3535
* @method Matrix divideinto(...$matrices)
36+
* @method Matrix directsum(...$matrices)
3637
*/
3738
class Matrix
3839
{

‎classes/src/operations/add.php ‎classes/src/Operations/add.php

File renamed without changes.

‎classes/src/operations/directsum.php ‎classes/src/Operations/directsum.php

File renamed without changes.

‎classes/src/operations/divideby.php ‎classes/src/Operations/divideby.php

File renamed without changes.

‎classes/src/operations/divideinto.php ‎classes/src/Operations/divideinto.php

File renamed without changes.

‎classes/src/operations/multiply.php ‎classes/src/Operations/multiply.php

File renamed without changes.

‎classes/src/operations/subtract.php ‎classes/src/Operations/subtract.php

File renamed without changes.

‎composer.json

+36-35
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,55 @@
2828
"Matrix\\": "classes/src/"
2929
},
3030
"files": [
31-
"classes/src/functions/adjoint.php",
32-
"classes/src/functions/antidiagonal.php",
33-
"classes/src/functions/cofactors.php",
34-
"classes/src/functions/determinant.php",
35-
"classes/src/functions/diagonal.php",
36-
"classes/src/functions/identity.php",
37-
"classes/src/functions/inverse.php",
38-
"classes/src/functions/minors.php",
39-
"classes/src/functions/trace.php",
40-
"classes/src/functions/transpose.php",
41-
"classes/src/operations/add.php",
42-
"classes/src/operations/directsum.php",
43-
"classes/src/operations/subtract.php",
44-
"classes/src/operations/multiply.php",
45-
"classes/src/operations/divideby.php",
46-
"classes/src/operations/divideinto.php"
31+
"classes/src/Functions/adjoint.php",
32+
"classes/src/Functions/antidiagonal.php",
33+
"classes/src/Functions/cofactors.php",
34+
"classes/src/Functions/determinant.php",
35+
"classes/src/Functions/diagonal.php",
36+
"classes/src/Functions/identity.php",
37+
"classes/src/Functions/inverse.php",
38+
"classes/src/Functions/minors.php",
39+
"classes/src/Functions/trace.php",
40+
"classes/src/Functions/transpose.php",
41+
"classes/src/Operations/add.php",
42+
"classes/src/Operations/directsum.php",
43+
"classes/src/Operations/subtract.php",
44+
"classes/src/Operations/multiply.php",
45+
"classes/src/Operations/divideby.php",
46+
"classes/src/Operations/divideinto.php"
4747
]
4848
},
4949
"autoload-dev": {
5050
"psr-4": {
51-
"Matrix\\Test\\": "unitTests/classes/src/"
51+
"MatrixTest\\": "unitTests/classes/src/"
5252
},
5353
"files": [
54-
"unitTests/classes/src/functions/adjointTest.php",
55-
"unitTests/classes/src/functions/antidiagonalTest.php",
56-
"unitTests/classes/src/functions/cofactorsTest.php",
57-
"unitTests/classes/src/functions/determinantTest.php",
58-
"unitTests/classes/src/functions/diagonalTest.php",
59-
"unitTests/classes/src/functions/identityTest.php",
60-
"unitTests/classes/src/functions/inverseTest.php",
61-
"unitTests/classes/src/functions/minorsTest.php",
62-
"unitTests/classes/src/functions/traceTest.php",
63-
"unitTests/classes/src/functions/transposeTest.php",
64-
"unitTests/classes/src/operations/addTest.php",
65-
"unitTests/classes/src/operations/directsumTest.php",
66-
"unitTests/classes/src/operations/subtractTest.php",
67-
"unitTests/classes/src/operations/multiplyTest.php",
68-
"unitTests/classes/src/operations/dividebyTest.php",
69-
"unitTests/classes/src/operations/divideintoTest.php"
54+
"classes/src/Functions/adjoint.php",
55+
"classes/src/Functions/antidiagonal.php",
56+
"classes/src/Functions/cofactors.php",
57+
"classes/src/Functions/determinant.php",
58+
"classes/src/Functions/diagonal.php",
59+
"classes/src/Functions/identity.php",
60+
"classes/src/Functions/inverse.php",
61+
"classes/src/Functions/minors.php",
62+
"classes/src/Functions/trace.php",
63+
"classes/src/Functions/transpose.php",
64+
"classes/src/Operations/add.php",
65+
"classes/src/Operations/directsum.php",
66+
"classes/src/Operations/subtract.php",
67+
"classes/src/Operations/multiply.php",
68+
"classes/src/Operations/divideby.php",
69+
"classes/src/Operations/divideinto.php"
7070
]
7171
},
7272
"scripts": {
73-
"style": "phpcs --report-width=200 --report=summary,full -n",
73+
"style": "phpcs --standard=PSR2 --report-width=200 --report=summary,full classes/src/ unitTests/classes/src -n",
7474
"test": "phpunit -c phpunit.xml.dist",
7575
"mess": "phpmd classes/src/ xml codesize,unusedcode,design,naming -n",
7676
"lines": "phploc classes/src/ -n",
7777
"cpd": "phpcpd classes/src/ -n",
78-
"versions": "phpcs --report-width=200 --report=summary,full classes/src/ --standard=PHPCompatibility --runtime-set testVersion 5.6- -n"
78+
"versions": "phpcs --report-width=200 --report=summary,full classes/src/ --standard=PHPCompatibility --runtime-set testVersion 5.6- -n",
79+
"coverage": "phpunit -c phpunit.xml.dist --coverage-text --coverage-html ./build/coverage"
7980
},
8081
"minimum-stability": "dev"
8182
}

‎examples/test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
include __DIR__ . '/../classes/Bootstrap.php';
3+
include __DIR__ . '/../vendor/autoload.php';
44

55
$grid1 = [
66
[1, 3, 2],

‎unitTests/classes/src/BaseTestAbstract.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest;
44

55
use Matrix\Matrix;
66
use PHPUnit\Framework\TestCase;

‎unitTests/classes/src/BuilderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest;
44

55
use Matrix\Builder;
66
use Matrix\Matrix;

‎unitTests/classes/src/functions/FunctionsCallTest.php ‎unitTests/classes/src/Functions/FunctionsCallTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Matrix\Test\functions;
3+
namespace MatrixTest\functions;
44

55
use Matrix\Exception;
66
use Matrix\Matrix;
7-
use Matrix\Test\BaseTestAbstract;
7+
use MatrixTest\BaseTestAbstract;
88
use function Matrix\adjoint;
99
use function Matrix\antidiagonal;
1010
use function Matrix\cofactors;

‎unitTests/classes/src/functions/adjointTest.php ‎unitTests/classes/src/Functions/adjointTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest\Functions;
44

55
use Matrix\Exception;
6+
use Matrix\Functions as MatrixFunctions;
67
use Matrix\Matrix;
8+
use MatrixTest\BaseTestAbstract;
79
use function Matrix\adjoint;
810

911
class adjointTest extends BaseTestAbstract
@@ -16,7 +18,7 @@ class adjointTest extends BaseTestAbstract
1618
public function testAdjoint($expected, $grid)
1719
{
1820
$matrix = new Matrix($grid);
19-
$result = Functions::adjoint($matrix);
21+
$result = MatrixFunctions::adjoint($matrix);
2022

2123
// Must return an object of the correct type...
2224
$this->assertIsMatrixObject($result);

‎unitTests/classes/src/functions/antidiagonalTest.php ‎unitTests/classes/src/Functions/antidiagonalTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest\Functions;
44

55
use Matrix\Exception;
6+
use Matrix\Functions as MatrixFunctions;
67
use Matrix\Matrix;
8+
use MatrixTest\BaseTestAbstract;
79
use function Matrix\antidiagonal;
810

911
class antidiagonalTest extends BaseTestAbstract
@@ -16,7 +18,7 @@ class antidiagonalTest extends BaseTestAbstract
1618
public function testAntidiagonal($expected, $grid)
1719
{
1820
$matrix = new Matrix($grid);
19-
$result = Functions::antidiagonal($matrix);
21+
$result = MatrixFunctions::antidiagonal($matrix);
2022

2123
// Must return an object of the correct type...
2224
$this->assertIsMatrixObject($result);

‎unitTests/classes/src/functions/cofactorsTest.php ‎unitTests/classes/src/Functions/cofactorsTest.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest\Functions;
44

5+
use Matrix\Exception;
6+
use Matrix\Functions as MatrixFunctions;
57
use Matrix\Matrix;
8+
use MatrixTest\BaseTestAbstract;
69
use function Matrix\cofactors;
710

811
class cofactorsTest extends BaseTestAbstract
@@ -15,7 +18,7 @@ class cofactorsTest extends BaseTestAbstract
1518
public function testCofactors($expected, $grid)
1619
{
1720
$matrix = new Matrix($grid);
18-
$result = Functions::cofactors($matrix);
21+
$result = MatrixFunctions::cofactors($matrix);
1922

2023
// Must return an object of the correct type...
2124
$this->assertIsMatrixObject($result);

‎unitTests/classes/src/functions/determinantTest.php ‎unitTests/classes/src/Functions/determinantTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest\Functions;
44

55
use Matrix\Exception;
6+
use Matrix\Functions as MatrixFunctions;
67
use Matrix\Matrix;
8+
use MatrixTest\BaseTestAbstract;
79
use function Matrix\determinant;
810

911
class determinantTest extends BaseTestAbstract
@@ -16,7 +18,7 @@ class determinantTest extends BaseTestAbstract
1618
public function testDeterminant($expected, $grid)
1719
{
1820
$matrix = new Matrix($grid);
19-
$result = Functions::determinant($matrix);
21+
$result = MatrixFunctions::determinant($matrix);
2022

2123
$this->assertEquals($expected, $result);
2224
// Verify that the original matrix remains unchanged

‎unitTests/classes/src/functions/diagonalTest.php ‎unitTests/classes/src/Functions/diagonalTest.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest\Functions;
44

5+
use Matrix\Exception;
6+
use Matrix\Functions as MatrixFunctions;
57
use Matrix\Matrix;
8+
use MatrixTest\BaseTestAbstract;
69
use function Matrix\diagonal;
710

811
class diagonalTest extends BaseTestAbstract
@@ -15,7 +18,7 @@ class diagonalTest extends BaseTestAbstract
1518
public function testDiagonal($expected, $grid)
1619
{
1720
$matrix = new Matrix($grid);
18-
$result = Functions::diagonal($matrix);
21+
$result = MatrixFunctions::diagonal($matrix);
1922

2023
// Must return an object of the correct type...
2124
$this->assertIsMatrixObject($result);

‎unitTests/classes/src/functions/identityTest.php ‎unitTests/classes/src/Functions/identityTest.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<?php
22

3-
namespace Matrix\Test;
3+
namespace MatrixTest\Functions;
44

5+
use Matrix\Exception;
6+
use Matrix\Functions as MatrixFunctions;
57
use Matrix\Matrix;
8+
use MatrixTest\BaseTestAbstract;
69
use function Matrix\identity;
710

811
class identityTest extends BaseTestAbstract
@@ -15,7 +18,7 @@ class identityTest extends BaseTestAbstract
1518
public function testIdentity($expected, $grid)
1619
{
1720
$matrix = new Matrix($grid);
18-
$result = Functions::identity($matrix);
21+
$result = MatrixFunctions::identity($matrix);
1922

2023
// Must return an object of the correct type...
2124
$this->assertIsMatrixObject($result);

0 commit comments

Comments
 (0)