Skip to content

Commit 250e3e4

Browse files
mckenzieartsmckenziearts
committed
chore: rebase main
1 parent 3ed8dbc commit 250e3e4

File tree

11 files changed

+3666
-188
lines changed

11 files changed

+3666
-188
lines changed

‎composer.lock

Lines changed: 3467 additions & 137 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpunit.xml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<<<<<<< HEAD
23
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
45
bootstrap="vendor/autoload.php"
@@ -29,4 +30,61 @@
2930
<env name="QUEUE_CONNECTION" value="sync"/>
3031
<env name="SESSION_DRIVER" value="array"/>
3132
</php>
33+
||||||| parent of db5bfeb (refactoring: Drop laravel world dependencies and apply refactoring to views and tests)
34+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
35+
<testsuites>
36+
<testsuite name="Integration">
37+
<directory suffix="Test.php">./tests/Integration</directory>
38+
</testsuite>
39+
<testsuite name="Feature">
40+
<directory suffix="Test.php">./tests/Feature</directory>
41+
</testsuite>
42+
</testsuites>
43+
<coverage/>
44+
<php>
45+
<server name="APP_ENV" value="testing"/>
46+
<env name="APP_KEY" value="base64:NXoQgjw2ZlOxnGbo5ZRhYgTdM6xLYsgYElNAgcTQJkE="/>
47+
<server name="BCRYPT_ROUNDS" value="4"/>
48+
<server name="CACHE_DRIVER" value="array"/>
49+
<server name="DB_CONNECTION" value="sqlite"/>
50+
<server name="DB_DATABASE" value=":memory:"/>
51+
<server name="MAIL_MAILER" value="array"/>
52+
<server name="QUEUE_CONNECTION" value="sync"/>
53+
<server name="SESSION_DRIVER" value="array"/>
54+
<server name="TELESCOPE_ENABLED" value="false"/>
55+
</php>
56+
<source>
57+
<include>
58+
<directory suffix=".php">./app</directory>
59+
</include>
60+
</source>
61+
=======
62+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
63+
<testsuites>
64+
<testsuite name="Unit">
65+
<directory suffix="Test.php">./tests/Unit</directory>
66+
</testsuite>
67+
<testsuite name="Feature">
68+
<directory suffix="Test.php">./tests/Feature</directory>
69+
</testsuite>
70+
</testsuites>
71+
<coverage/>
72+
<php>
73+
<server name="APP_ENV" value="testing"/>
74+
<env name="APP_KEY" value="base64:NXoQgjw2ZlOxnGbo5ZRhYgTdM6xLYsgYElNAgcTQJkE="/>
75+
<server name="BCRYPT_ROUNDS" value="4"/>
76+
<server name="CACHE_DRIVER" value="array"/>
77+
<server name="DB_CONNECTION" value="sqlite"/>
78+
<server name="DB_DATABASE" value=":memory:"/>
79+
<server name="MAIL_MAILER" value="array"/>
80+
<server name="QUEUE_CONNECTION" value="sync"/>
81+
<server name="SESSION_DRIVER" value="array"/>
82+
<server name="TELESCOPE_ENABLED" value="false"/>
83+
</php>
84+
<source>
85+
<include>
86+
<directory suffix=".php">./app</directory>
87+
</include>
88+
</source>
89+
>>>>>>> db5bfeb (refactoring: Drop laravel world dependencies and apply refactoring to views and tests)
3290
</phpunit>

‎public/css/filament/filament/app.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎public/css/filament/forms/forms.css

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎public/css/filament/support/support.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎public/js/filament/forms/components/date-time-picker.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/filament/forms/components/file-upload.js

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/filament/forms/components/markdown-editor.js

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/filament/forms/components/rich-editor.js

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/filament/support/support.js

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/filament/widgets/components/chart.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)