Skip to content

Commit

Permalink
[no ticket] Removed phpdocumentor as it conflicts with Symfony3. Use …
Browse files Browse the repository at this point in the history
…phpdocumentor as phar instead.
  • Loading branch information
thisismeonmounteverest committed Feb 20, 2016
1 parent b472669 commit 0b4de66
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 34 deletions.
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"swiftmailer/swiftmailer": "5.*",
"twbs/bootstrap4": "@dev",
"components/font-awesome": "4.*",
"Twig/Twig": "master@dev",
"Twig/Twig": "1.*",
"select2/select2": "4.*",
"symfony/twig-bridge": "~3.0",
"symfony/translation": "~3.0",
Expand All @@ -47,13 +47,12 @@
"illuminate/events": "5.*",
"components/jquery": "^2.1",
"symfony/dependency-injection": "~3.0",
"symfony/validator": "~3.0",
"symfony/validator": "3.0 as 2.8",
"foolz/sphinxql-query-builder": "^1.0",
"anthonymartin/geo-location": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "5.2",
"sami/sami": "3.*"
"phpunit/phpunit": "5.2"
},
"autoload": {
"psr-4": {
Expand Down
35 changes: 35 additions & 0 deletions phpdoc.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8" ?>
<phpdocumentor>
<parser>
<default-package-name>Rox</default-package-name>
<encoding>utf-8</encoding>
<target>doc/cache</target>
<markers>
<item>TODO</item>
<item>FIXME</item>
</markers>
<extensions>
<extension>php</extension>
<extension>php3</extension>
<extension>phtml</extension>
</extensions>
<visibility></visibility>
</parser>
<files>
<directory>Rox</directory>
<ignore-hidden>true</ignore-hidden>
<ignore-symlinks>true</ignore-symlinks>
</files>
<transformer>
<target>doc/</target>
</transformer>
<logging>
<level>error</level>
</logging>
<transformations>
<template name="responsive-twig"/>
</transformations>
<translator>
<locale>en</locale>
</translator>
</phpdocumentor>
30 changes: 0 additions & 30 deletions sami.cfg.php

This file was deleted.

0 comments on commit 0b4de66

Please sign in to comment.