Reorganize the folder structure and apply new CS standard (#405)

* Reorganize the folder structure and apply new CS standard * Change XSD schema to use the lowest version available * Fix broken build due to route name being converted to number
getsentry · Jan 5, 2021 · 7f82f1c · 7f82f1c
1 parent 40ff42b
commit 7f82f1c
Show file tree

Hide file tree

Showing 126 changed files with 294 additions and 2,141 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,4 @@
-examples/ export-ignore
-test/ export-ignore
+tests/ export-ignore
 var/ export-ignore
 .* export-ignore
 Makefile export-ignore

diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,7 @@ package.xml
 /vendor
 .idea
 .php_cs.cache
+.phpunit.result.cache
 docs/_build
 var
+tests/clover.xml
diff --git a/.php_cs b/.php_cs
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,36 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        'ordered_imports' => [
+            'imports_order' => ['class', 'function', 'const'],
+        ],
+        'declare_strict_types' => true,
+        'psr0' => true,
+        'psr4' => true,
+        'random_api_migration' => true,
+        'yoda_style' => true,
+        'self_accessor' => false,
+        'phpdoc_no_useless_inheritdoc' => false,
+        'phpdoc_to_comment' => false,
+        'phpdoc_align' => [
+            'tags' => ['param', 'return', 'throws', 'type', 'var'],
+        ],
+        'phpdoc_line_span' => [
+            'const' => 'multi',
+            'method' => 'multi',
+            'property' => 'multi',
+        ],
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+            ->exclude(['var'])
+    )
+;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,8 @@
 - Support the XML format for the bundle configuration (#401)
 - PHP 8 support (#399, thanks to @Yozhef)
 - Retrieve the request from the `RequestStack` when using the `RequestIntegration` integration (#361)
-
+- Reorganize the folder structure and change CS standard (#405)
+
 ## 3.5.3 (2020-10-13)
 
 - Refactors and fixes class aliases for more robustness (#315 #359, thanks to @guilliamxavier)

diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Sentry\\SentryBundle\\Test\\": "test"
+            "Sentry\\SentryBundle\\Tests\\": "tests/"
         }
     },
     "scripts": {

diff --git a/examples/symfony-3/.gitignore b/examples/symfony-3/.gitignore
diff --git a/examples/symfony-3/LICENSE b/examples/symfony-3/LICENSE
diff --git a/examples/symfony-3/Makefile b/examples/symfony-3/Makefile
diff --git a/examples/symfony-3/README.md b/examples/symfony-3/README.md
diff --git a/examples/symfony-3/app/.htaccess b/examples/symfony-3/app/.htaccess
diff --git a/examples/symfony-3/app/AppCache.php b/examples/symfony-3/app/AppCache.php
diff --git a/examples/symfony-3/app/AppKernel.php b/examples/symfony-3/app/AppKernel.php
diff --git a/examples/symfony-3/app/Resources/views/base.html.twig b/examples/symfony-3/app/Resources/views/base.html.twig
diff --git a/examples/symfony-3/app/Resources/views/default/index.html.twig b/examples/symfony-3/app/Resources/views/default/index.html.twig
diff --git a/examples/symfony-3/app/autoload.php b/examples/symfony-3/app/autoload.php