App update
This commit is contained in:
parent
8c33fa58c1
commit
7d108fe9c3
|
|
@ -2,8 +2,7 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="cf1e275f-fbc1-41d4-a421-0f55447b6367" name="Default" comment="">
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app_nginx.conf" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Procfile" afterPath="$PROJECT_DIR$/Procfile" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/App.php" afterPath="$PROJECT_DIR$/app/App.php" />
|
||||
</list>
|
||||
<ignored path="resume.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
|
|
@ -55,17 +54,7 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="app_nginx.conf" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app_nginx.conf">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="220">
|
||||
<caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Procfile" pinned="false" current-in-tab="true">
|
||||
<file leaf-file-name="Procfile" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/Procfile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
|
|
@ -88,6 +77,16 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="App.php" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/app/App.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="462">
|
||||
<caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Gruntfile.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/Gruntfile.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
|
@ -157,7 +156,6 @@
|
|||
<option value="$PROJECT_DIR$/config/config.yml" />
|
||||
<option value="$PROJECT_DIR$/src/Sikofitt/Config.php" />
|
||||
<option value="$PROJECT_DIR$/src/Sikofitt/Json/JsonDecoder.php" />
|
||||
<option value="$PROJECT_DIR$/app/App.php" />
|
||||
<option value="$PROJECT_DIR$/src/Sikofitt/Config/ConfigServiceProvider.php" />
|
||||
<option value="$PROJECT_DIR$/src/Sikofitt/Json/ResumeBuilder.php" />
|
||||
<option value="$PROJECT_DIR$/composer.json" />
|
||||
|
|
@ -177,6 +175,7 @@
|
|||
<option value="$PROJECT_DIR$/package.json" />
|
||||
<option value="$PROJECT_DIR$/app_nginx.conf" />
|
||||
<option value="$PROJECT_DIR$/Procfile" />
|
||||
<option value="$PROJECT_DIR$/app/App.php" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -191,8 +190,8 @@
|
|||
</component>
|
||||
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="-8" />
|
||||
<option name="y" value="106" />
|
||||
<option name="x" value="110" />
|
||||
<option name="y" value="54" />
|
||||
<option name="width" value="1701" />
|
||||
<option name="height" value="893" />
|
||||
</component>
|
||||
|
|
@ -308,6 +307,20 @@
|
|||
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="resume" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="resume" />
|
||||
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="app" />
|
||||
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scratches" />
|
||||
|
|
@ -413,15 +426,15 @@
|
|||
<workItem from="1467606347040" duration="3843000" />
|
||||
<workItem from="1467840020930" duration="1614000" />
|
||||
<workItem from="1467938148836" duration="1798000" />
|
||||
<workItem from="1468092833685" duration="2222000" />
|
||||
<workItem from="1468092833685" duration="3410000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="31149000" />
|
||||
<option name="totallyTimeSpent" value="32337000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="106" width="1701" height="893" extended-state="0" />
|
||||
<frame x="110" y="54" width="1701" height="893" extended-state="1" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
|
|
@ -769,14 +782,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/App.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="792">
|
||||
<caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Sikofitt/less/resume.less">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1078">
|
||||
|
|
@ -865,10 +870,10 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<entry file="file://$PROJECT_DIR$/Procfile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="396">
|
||||
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="79" selection-start-line="0" selection-start-column="79" selection-end-line="0" selection-end-column="79" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -881,10 +886,18 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/Procfile">
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="79" selection-start-line="0" selection-start-column="79" selection-end-line="0" selection-end-column="79" />
|
||||
<state relative-caret-position="396">
|
||||
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/App.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="462">
|
||||
<caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
|
|||
|
|
@ -115,7 +115,6 @@ class App extends Application
|
|||
switch ($code) {
|
||||
case 405:
|
||||
|
||||
|
||||
preg_match('/\(Allow\:(.+)\)/', $e->getMessage(), $matches);
|
||||
if(isset($matches[1])) {
|
||||
$matches = trim($matches[1]);
|
||||
|
|
@ -128,7 +127,7 @@ class App extends Application
|
|||
//$message = 'Sorry bout that.<br />' . $e->getMessage();
|
||||
break;
|
||||
default:
|
||||
$message = $this['twig']->render('error500.html.twig');
|
||||
$message = json_encode(['status' => 'error', 'message' => $e->getMessage(), 'code' => $code]);
|
||||
}
|
||||
return new \Symfony\Component\HttpFoundation\Response($message, $code);
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue