FAQ
Commit: 43a9fc5a762ea950f10580b4a19e21123ab4ce0c
Author: Rasmus Lerdorf <rasmus@php.net> Thu, 12 Mar 2015 00:41:48 +1100
Parents: 931873ca1f989c27c4d40c50e8740f5224f4d605
Branches: master

Link: http://git.php.net/?p=presentations.git;a=commitdiff;h=43a9fc5a762ea950f10580b4a19e21123ab4ce0c

Log:
tweak

Changed paths:
   M oz15.html
   M oz15.xml
   M slides/intro/php7_2015.xml


Diff:
diff --git a/oz15.html b/oz15.html
index 2dbe3de..13932c0 100644
--- a/oz15.html
+++ b/oz15.html
@@ -191,14 +191,6 @@ BUT nobody was interested!<br />
  </aside>
   </section>
   <section>
- <h1 style="text-align:center;"></h1>
- <h1 style="text-align:center;">Open Source!</h1>
-<aside class="notes"><br />
-Entered the world of open source<br />
-Although the term didn't exist at the time<br />
-</aside>
- </section>
- <section>
    <section id="php7">
    <h2 margin-bottom="2em">PHP 7</h2><br>
    <p class="p" style="font-size:1.1em;text-align:left;">✔ engine improvements</p>
@@ -232,13 +224,13 @@ echo $a ?? $x ?? $c; // 2</code></pre>
    </section>
  <section id="php7excep">
    <p class="p" style="font-size:1.1em;text-align:left;">✔ Exceptions on Fatals</p>
- <pre><code data-trim style="font-size:1.5em;">function call_method($obj) {
+ <pre><code data-trim style="font-size:1.1em;">function call_method($obj) {
      $obj-&gt;method();
  }

  call_method(null);
  // Fatal error: Call to a member function method() on a non-object</code></pre>
- <pre><code data-trim style="font-size:1.5em;">try {
+ <pre><code data-trim style="font-size:1.1em;">try {
      call_method(null);
  } catch (EngineException $e) {
      echo &quot;Exception: {$e-&gt;getMessage()}\n&quot;;
diff --git a/oz15.xml b/oz15.xml
index 66dccf4..72c6068 100644
--- a/oz15.xml
+++ b/oz15.xml
@@ -31,7 +31,6 @@ PHP in 2015 with a focus on performance
  <slide>slides/intro/20years.xml</slide>
  <slide>slides/intro/phpannounce.xml</slide>
  <slide>slides/intro/capi.xml</slide>
-<slide>slides/intro/opensource.xml</slide>

  <slide>slides/intro/php7_2015.xml</slide>
  <slide>slides/intro/perf2014.xml</slide>
diff --git a/slides/intro/php7_2015.xml b/slides/intro/php7_2015.xml
index 733e05d..87cfccb 100644
--- a/slides/intro/php7_2015.xml
+++ b/slides/intro/php7_2015.xml
@@ -38,7 +38,7 @@ echo $a ?? $x ?? $c; // 2

  <break lines="1" section="php7excep"/>
  <blurb fontsize="1.1em" align="left">✔ Exceptions on Fatals</blurb>
-<example fontsize="1.5em" result='0' title=""><![CDATA[
+<example fontsize="1.1em" result='0' title=""><![CDATA[
  <?php
  function call_method($obj) {
      $obj->method();
@@ -48,7 +48,7 @@ call_method(null);
  // Fatal error: Call to a member function method() on a non-object
  ]]></example>

-<example fontsize="1.5em" result='0' title=""><![CDATA[
+<example fontsize="1.1em" result='0' title=""><![CDATA[
  <?php
  try {
      call_method(null);

Search Discussions

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 1 of 1 | next ›
Discussion Overview
groupphp-pres @
categoriesphp
postedMar 11, '15 at 1:42p
activeMar 11, '15 at 1:42p
posts1
users1
websitephp.net

1 user in discussion

Rasmus Lerdorf: 1 post

People

Translate

site design / logo © 2017 Grokbase